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

Commit 6adbe74b authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a 

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

Change-Id: Ic4dd5daa7ec14ebd94d54ac789a9d93c6ff7b556
parents f841d3fa 60773b9a

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

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

            ChoiceTooShort(

                    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,

                    LeftButtonMode.Retry, RightButtonMode.ContinueDisabled,

                    ID_EMPTY_MESSAGE, true),

            FirstChoiceValid(

                    R.string.lock_settings_picker_biometrics_added_security_message,

                    ID_EMPTY_MESSAGE,

                    R.string.lockpattern_choose_pattern_description,

                    R.string.lockpattern_pattern_entered_header,

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

            NeedToConfirm(