commit d7b4b1b951d77a8ef8365abdfbfc979c7fc2911c
author Kevin Chyn <kchyn@google.com> Wed Feb 28 17:28:15 2018 -0800
committer Kevin Chyn <kchyn@google.com> Wed Feb 28 17:28:15 2018 -0800
tree 22a6441c8ca5fd4ec97ed78cae47322301d67908
parent c3bc3bc690e2743693694dc50b3c600f137f69cf

ChooseLockPassword shows wrong string when confirmed password is wrong

Fixes: 70561469

Test: try to setup a password/pin, but type in a wrong pw/pin
      when confirming. the button should stay as "confirm" instead of
      reverting to "next"

Change-Id: Iea570c2d869b9d561b26046d30d08f40abca0c93

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

diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index a9c5c03..14c8877 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -279,7 +279,7 @@
                     0,
                     0,
                     0,
-                    R.string.next_label);
+                    R.string.lockpassword_confirm_label);
 
             Stage(int hintInAlpha, int hintInAlphaForFingerprint,
                     int hintInNumeric, int hintInNumericForFingerprint,