Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbbcdd6e authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Make choose lock screen consistent" into main

parents 3a719933 42e46e01

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

+1 −3
Original line number Diff line number Diff line
@@ -124,9 +124,7 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo 


    @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,