commit 95d7c970dc80304f84545ba4614d75b8e64c7744
author Udam Saini <udam@google.com> Tue Feb 16 21:00:06 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 16 21:00:06 2016 +0000
tree 3e90d7097b0cd518af646522fad9a6ce8efc1929
parent 7d725461c60cf0cd36e7e0a1e999fa3c84f12419
parent 9757152d16c2f4564d1ea826b266fe03c27103b6

Merge "Removes tap continue when done text" into nyc-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0e7ca62..84d3632 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1135,9 +1135,6 @@
     <string name="lockpassword_pin_too_short">PIN must be at least %d digits</string>
 
     <!-- Hint shown after minimum password criteria is met -->
-    <string name="lockpassword_press_continue">Tap Continue when done</string>
-
-    <!-- Hint shown after minimum password criteria is met -->
     <string name="lockpassword_continue_label">Continue</string>
 
     <!-- Error shown in popup when password is too long -->

src/com/android/settings/ChooseLockPassword.java

diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 2a8de8b..1376176 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -616,7 +616,7 @@
                         mHeaderText.setText(error);
                         setNextEnabled(false);
                     } else {
-                        mHeaderText.setText(R.string.lockpassword_press_continue);
+                        mHeaderText.setText(null);
                         setNextEnabled(true);
                     }
                 }