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

Commit 40795bae authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24942007'] into udc-qpr1-release. 

Change-Id: I0ee9abc313e868db37604a980dfa764a399ec0ca
parents 7db0b66d 5c7a73a8

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

+3 −1
Original line number Diff line number Diff line
@@ -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) {

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

+0 −6
Original line number Diff line number Diff line
@@ -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