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

Commit f6fdfb0d authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup... 

Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev
parents 26e14e09 8a9be07f

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

+1 −3
Original line number Diff line number Diff line
@@ -121,9 +121,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);

        Intent intent = new Intent(this, SetupChooseLockGeneric.class);

        intent.setAction(mNewPasswordAction);

        intent.putExtras(chooseLockFingerprintExtras);

        if (mCallerAppName != null) {

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

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