diff options
| author | Xin Li <delphij@google.com> | 2023-12-07 15:48:03 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-12-07 15:48:03 -0800 |
| commit | 4f1ec8cb8a58a78e314798df55bca6069a548906 (patch) | |
| tree | 924bc9d9249544d85e92fa4e03eccc36f4306f98 | |
| parent | da05498175dabebad7c99c821a1d91106140e524 (diff) | |
| parent | 40795bae8fff8fce4a91c449d5f6ff89e066afda (diff) | |
| download | Settings-tmp_amf_315507370.tar.gz | |
Merge UQ1A.231205.015tmp_amf_315507370
Bug: 308969284
Merged-In: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
Change-Id: I22fa193e9846fdb998810c93c9c26344a40d89a9
| -rw-r--r-- | src/com/android/settings/password/SetNewPasswordActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/password/SetupChooseLockGeneric.java | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java index e54ae7ae25b..fc664eccde1 100644 --- a/src/com/android/settings/password/SetNewPasswordActivity.java +++ b/src/com/android/settings/password/SetNewPasswordActivity.java @@ -121,7 +121,9 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo @Override public void launchChooseLock(Bundle chooseLockFingerprintExtras) { - Intent intent = new Intent(this, SetupChooseLockGeneric.class); + final boolean isInSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent()); + Intent intent = isInSetupWizard ? new Intent(this, SetupChooseLockGeneric.class) + : new Intent(this, ChooseLockGeneric.class); intent.setAction(mNewPasswordAction); intent.putExtras(chooseLockFingerprintExtras); if (mCallerAppName != null) { diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index a3bef83d925..bc6c5129968 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -256,12 +256,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { return InternalSetupChooseLockGenericFragment.class; } - @Override - protected boolean isToolbarEnabled() { - // Hide the action bar from this page. - return false; - } - public static class InternalSetupChooseLockGenericFragment extends ChooseLockGenericFragment { @Override |