PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic4dd5daa7ec14ebd94d54ac789a9d93c6ff7b556
This commit is contained in:
Beverly Tai
2021-08-05 21:50:27 +00:00
committed by Automerger Merge Worker
parent f841d3fa4f 60773b9a37
commit 6adbe74b92
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -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(