commit c9a609eb6d183e3ecd0e68fe9bb9ec27d9dda561
author Beverly <beverlyt@google.com> Thu Aug 05 08:56:28 2021 -0400
committer Beverly Tai <beverlyt@google.com> Thu Aug 05 17:17:30 2021 +0000
tree f2981a141d2bceafa3a4b324c56e407a62421bad
parent 6f1bc2f52ee09d21406898a83c57d15ac7ebb966

Use pattern subtitle string on all enroll stages

So the views won't relayout and cause the pattern
to render in a strange way.

Test: manual
Bug: 194368020
Change-Id: If6fd7ade4fd6783fe5d1ef78acc847928e01bd29

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

diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 3c43fc3..e85ce60 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -370,13 +370,13 @@
                     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(