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

Commit 4f1ec8cb authored by Xin Li's avatar Xin Li
Browse files

Merge UQ1A.231205.015 

Bug: 308969284
Merged-In: I5d9d1d30d280311875d8bd8604aed0fd0c08ab2c
Change-Id: I22fa193e9846fdb998810c93c9c26344a40d89a9
parents da054981 40795bae

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

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




    @Override

    @Override

    public void launchChooseLock(Bundle chooseLockFingerprintExtras) {

    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.setAction(mNewPasswordAction);

        intent.putExtras(chooseLockFingerprintExtras);

        intent.putExtras(chooseLockFingerprintExtras);

        if (mCallerAppName != null) {

        if (mCallerAppName != null) {

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -256,12 +256,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { 
            return InternalSetupChooseLockGenericFragment.class;

            return InternalSetupChooseLockGenericFragment.class;

        }

        }





        @Override

        protected boolean isToolbarEnabled() {

            // Hide the action bar from this page.

            return false;

        }



        public static class InternalSetupChooseLockGenericFragment

        public static class InternalSetupChooseLockGenericFragment

                extends ChooseLockGenericFragment {

                extends ChooseLockGenericFragment {

            @Override

            @Override