diff options
| author | Jason Chang <jasonsfchang@google.com> | 2023-10-04 17:00:44 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-20 00:00:37 +0000 |
| commit | 5c7a73a8fb1dc5653d50233e422437184ff5eddf (patch) | |
| tree | 05beb8a2512aea6f78e55ed9c7a794fe4a4b5cef | |
| parent | 7db0b66d9a459b5c1347c3c232b3f3ec10a863b7 (diff) | |
| download | Settings-5c7a73a8fb1dc5653d50233e422437184ff5eddf.tar.gz | |
Revert fixing the style of Choose screen lock wasn’t consistent
in initial setup and deferred setup
Bug: 301383804
Test: manually test with reproduciable steps in PO mode:
1. Set up offline and skip initial setup.
2. Navigate to home screen.
4. Connect to WiFi.
3. Sign in corp account during deferred setup.
5. Navigate to screen lock setup.
4. When landing on Choose screen lock, observe the behavior.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fdf80bd5c945f142e8529f104ca8b6d38d66d158)
Merged-In: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
Change-Id: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
| -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 |