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

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

Browse Source 
am: 95d7c970dc

* commit '95d7c970dc80304f84545ba4614d75b8e64c7744':
  Removes tap continue when done text
This commit is contained in:
Udam Saini
2016-02-16 21:06:22 +00:00
committed by android-build-merger
parent 120a8eaea1 95d7c970dc
commit 4284c830ea
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -1134,9 +1134,6 @@
<!-- Hint shown in dialog screen when PIN is too short --> <!-- Hint shown in dialog screen when PIN is too short -->
<string name="lockpassword_pin_too_short">PIN must be at least %d digits</string> <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 --> <!-- Hint shown after minimum password criteria is met -->
<string name="lockpassword_continue_label">Continue</string> <string name="lockpassword_continue_label">Continue</string>

2
src/com/android/settings/ChooseLockPassword.java
View File

@@ -616,7 +616,7 @@ public class ChooseLockPassword extends SettingsActivity {
mHeaderText.setText(error); mHeaderText.setText(error);
setNextEnabled(false); setNextEnabled(false);
} else { } else {
mHeaderText.setText(R.string.lockpassword_press_continue); mHeaderText.setText(null);
setNextEnabled(true); setNextEnabled(true);
} }
} }