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

Commit ec26d4e5 authored by Pasty Chang's avatar Pasty Chang Committed by android-build-merger
Browse files

Merge "Change to show generic lock screen before setup fingerprint or face"... 

Merge "Change to show generic lock screen before setup fingerprint or face" into qt-dev am: 39349243
am: bd758f81

Change-Id: I8d4404796e4e5e0565546678c894da2319853717
parents 63d5209b bd758f81

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

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ public class ChooseLockPassword extends SettingsActivity { 
            }

        }



        private int getStageType() {

        protected int getStageType() {

            return mForFingerprint ? Stage.TYPE_FINGERPRINT :

                    mForFace ? Stage.TYPE_FACE :

                            Stage.TYPE_NONE;

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

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class ChooseLockPattern extends SettingsActivity { 
        // how long we wait to clear a wrong pattern

        private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;



        private static final int ID_EMPTY_MESSAGE = -1;

        protected static final int ID_EMPTY_MESSAGE = -1;



        private static final String FRAGMENT_TAG_SAVE_AND_FINISH = "save_and_finish_worker";

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

+7 −0
Original line number Diff line number Diff line
@@ -131,6 +131,13 @@ public class SetupChooseLockPassword extends ChooseLockPassword { 
            startChooseLockActivity(lock, getActivity());

        }



        @Override

        protected int getStageType() {

            // Return TYPE_NONE to make generic lock screen launch in Setup wizard flow before

            // fingerprint and face setup.

            return Stage.TYPE_NONE;

        }



        @Override

        protected void updateUi() {

            super.updateUi();

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

+17 −0
Original line number Diff line number Diff line
@@ -54,6 +54,15 @@ public class SetupChooseLockPattern extends ChooseLockPattern { 
        return SetupChooseLockPatternFragment.class;

    }



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        // Show generic pattern title when pattern lock screen launch in Setup wizard flow before

        // fingerprint and face setup.

        setTitle(R.string.lockpassword_choose_your_screen_lock_header);

    }



    public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment

            implements ChooseLockTypeDialogFragment.OnLockTypeSelectedListener {
@@ -116,6 +125,14 @@ public class SetupChooseLockPattern extends ChooseLockPattern { 
            } else {

                mLeftButtonIsSkip = false;

            }



            // Show generic pattern message when pattern lock screen launch in Setup wizard flow

            // before fingerprint and face setup.

            if (stage.message == ID_EMPTY_MESSAGE) {

                mMessageText.setText("");

            } else {

                mMessageText.setText(stage.message);

            }

        }



        @Override