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

This commit is contained in:
Udam Saini
2016-02-16 21:00:06 +00:00
committed by Android (Google) Code Review
2 changed files with 1 additions and 4 deletions

View File

@@ -1134,9 +1134,6 @@
<!-- Hint shown in dialog screen when PIN is too short -->
<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>

View File

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