PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 8770325 from fb2bd662ba to tm-qpr1-release

Browse Source 
Change-Id: I99696363ea784a88ba63ef1c2fff03b02834269f
This commit is contained in:
Android Build Coastguard Worker
2022-06-25 23:25:04 +00:00
parent eb9dfb9ab3 fb2bd662ba
commit 76a69368a6
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -639,13 +639,17 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
new Animator.AnimatorListener() { new Animator.AnimatorListener() {
@Override @Override
public void onAnimationStart(Animator animation) { } public void onAnimationStart(Animator animation) {
startIconAnimation();
}
@Override @Override
public void onAnimationRepeat(Animator animation) { } public void onAnimationRepeat(Animator animation) { }
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
stopIconAnimation();
if (mProgressBar.getProgress() >= PROGRESS_BAR_MAX) { if (mProgressBar.getProgress() >= PROGRESS_BAR_MAX) {
mProgressBar.postDelayed(mDelayedFinishRunnable, getFinishDelay()); mProgressBar.postDelayed(mDelayedFinishRunnable, getFinishDelay());
} }

15
src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
View File

@@ -46,6 +46,7 @@ import androidx.preference.PreferenceGroup;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Settings; import com.android.settings.Settings;
import com.android.settings.Settings.TetherSettingsActivity; import com.android.settings.Settings.TetherSettingsActivity;
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.gestures.OneHandedSettingsUtils; import com.android.settings.gestures.OneHandedSettingsUtils;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
@@ -127,7 +128,7 @@ public class CreateShortcutPreferenceController extends BasePreferenceController
return false; return false;
} }
final Intent shortcutIntent = createResultIntent( final Intent shortcutIntent = createResultIntent(
buildShortcutIntent(info), buildShortcutIntent(uiContext, info),
info, clickTarget.getTitle()); info, clickTarget.getTitle());
mHost.setResult(Activity.RESULT_OK, shortcutIntent); mHost.setResult(Activity.RESULT_OK, shortcutIntent);
logCreateShortcut(info); logCreateShortcut(info);
@@ -210,10 +211,14 @@ public class CreateShortcutPreferenceController extends BasePreferenceController
info.activityInfo.name); info.activityInfo.name);
} }
private static Intent buildShortcutIntent(ResolveInfo info) { private static Intent buildShortcutIntent(Context context, ResolveInfo info) {
return new Intent(SHORTCUT_PROBE) Intent intent = new Intent(SHORTCUT_PROBE)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP) .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP)
.setClassName(info.activityInfo.packageName, info.activityInfo.name); .setClassName(info.activityInfo.packageName, info.activityInfo.name);
if (ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
}
return intent;
} }
private static ShortcutInfo createShortcutInfo(Context context, Intent shortcutIntent, private static ShortcutInfo createShortcutInfo(Context context, Intent shortcutIntent,
@@ -277,8 +282,8 @@ public class CreateShortcutPreferenceController extends BasePreferenceController
ResolveInfo ri = context.getPackageManager().resolveActivity(si.getIntent(), 0); ResolveInfo ri = context.getPackageManager().resolveActivity(si.getIntent(), 0);
if (ri != null) { if (ri != null) {
updatedShortcuts.add(createShortcutInfo(context, buildShortcutIntent(ri), ri, updatedShortcuts.add(createShortcutInfo(context,
si.getShortLabel())); buildShortcutIntent(context, ri), ri, si.getShortLabel()));
} }
} }
} }

1
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
View File

@@ -109,6 +109,7 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
/* deviceProfile */ "", /* deviceProfile */ "",
/* selfManaged */ false, /* selfManaged */ false,
/* notifyOnDeviceNearby */ true, /* notifyOnDeviceNearby */ true,
/* revoked */ false,
/* timeApprovedMs */ System.currentTimeMillis(), /* timeApprovedMs */ System.currentTimeMillis(),
/* lastTimeConnected */ Long.MAX_VALUE); /* lastTimeConnected */ Long.MAX_VALUE);