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

Commit ccdee283 authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "Revert fixing the style of Choose screen lock wasn’t consistent in... 

Merge "Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: 2943132a am: 624ebae3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24942007



Change-Id: I0ceb3a5aec8537fa31c821bdee3a78a89d118071
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb366b4e 624ebae3

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