From fdf80bd5c945f142e8529f104ca8b6d38d66d158 Mon Sep 17 00:00:00 2001 From: Jason Chang Date: Wed, 4 Oct 2023 17:00:44 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20fixing=20the=20style=20of=20Choose=20s?= =?UTF-8?q?creen=20lock=20wasn=E2=80=99t=20consistent=20in=20initial=20set?= =?UTF-8?q?up=20and=20deferred=20setup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Change-Id: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c --- .../android/settings/password/SetNewPasswordActivity.java | 4 +++- .../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