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

Commit 60773b9a authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Use pattern subtitle string on all enroll stages" into sc-dev

parents b6321f88 c9a609eb

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -370,13 +370,13 @@ public class ChooseLockPattern extends SettingsActivity { 
                    LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false),

                    LeftButtonMode.Gone, RightButtonMode.Ok, ID_EMPTY_MESSAGE, false),

            ChoiceTooShort(

            ChoiceTooShort(

                    R.string.lock_settings_picker_biometrics_added_security_message,

                    R.string.lock_settings_picker_biometrics_added_security_message,

                    ID_EMPTY_MESSAGE,

                    R.string.lockpattern_choose_pattern_description,

                    R.string.lockpattern_recording_incorrect_too_short,

                    R.string.lockpattern_recording_incorrect_too_short,

                    LeftButtonMode.Retry, RightButtonMode.ContinueDisabled,

                    LeftButtonMode.Retry, RightButtonMode.ContinueDisabled,

                    ID_EMPTY_MESSAGE, true),

                    ID_EMPTY_MESSAGE, true),

            FirstChoiceValid(

            FirstChoiceValid(

                    R.string.lock_settings_picker_biometrics_added_security_message,

                    R.string.lock_settings_picker_biometrics_added_security_message,

                    ID_EMPTY_MESSAGE,

                    R.string.lockpattern_choose_pattern_description,

                    R.string.lockpattern_pattern_entered_header,

                    R.string.lockpattern_pattern_entered_header,

                    LeftButtonMode.Retry, RightButtonMode.Continue, ID_EMPTY_MESSAGE, false),

                    LeftButtonMode.Retry, RightButtonMode.Continue, ID_EMPTY_MESSAGE, false),

            NeedToConfirm(

            NeedToConfirm(