commit dbbcdd6ebea37a23c2452d9cad0fcf7ccb857de5
author Joshua Mccloskey <joshmccloskey@google.com> Fri Aug 09 17:16:04 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 09 17:16:04 2024 +0000
tree 27d6be47d137738edb5f6f47201f402d3bd41ec5
parent 3a719933861292b666e218b6e9ef2273af823125
parent 42e46e01050fb68eec1a066ae6f7e4fa6fc30d8c

Merge "Make choose lock screen consistent" into main

src/com/android/settings/password/SetNewPasswordActivity.java

diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java
index 0ba52ea..36756f9 100644
--- a/src/com/android/settings/password/SetNewPasswordActivity.java
+++ b/src/com/android/settings/password/SetNewPasswordActivity.java
@@ -124,9 +124,7 @@
 
     @Override
     public void launchChooseLock(Bundle chooseLockFingerprintExtras) {
-        final boolean isInSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
-        Intent intent = isInSetupWizard ? new Intent(this, SetupChooseLockGeneric.class)
-                : new Intent(this, ChooseLockGeneric.class);
+        final Intent intent = new Intent(this, SetupChooseLockGeneric.class);
         intent.setAction(mNewPasswordAction);
         intent.putExtras(chooseLockFingerprintExtras);
         intent.putExtra(EXTRA_KEY_CHOOSE_LOCK_SCREEN_TITLE,