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

Commit 99c51f65 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Launch ChooseLockGeneric by isInSetupWizard flag" into main

parents 4c4c978d fd2f78b1

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

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


    @Override

    public void launchChooseLock(Bundle chooseLockFingerprintExtras) {

        final 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);

        intent.putExtra(EXTRA_KEY_CHOOSE_LOCK_SCREEN_TITLE,