Merge "Update confirm button label"

This commit is contained in:
TreeHugger Robot
2017-10-30 19:09:34 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 3 deletions

View File

@@ -1379,8 +1379,8 @@
<string name="lockpassword_pin_no_sequential_digits">Ascending, descending, or repeated sequence <string name="lockpassword_pin_no_sequential_digits">Ascending, descending, or repeated sequence
of digits isn\'t allowed</string> of digits isn\'t allowed</string>
<!-- Label for ChoosePassword/PIN OK button --> <!-- Label for Confirm button when entering PIN / password the second time. [CHAR LIMIT=30] -->
<string name="lockpassword_ok_label">OK</string> <string name="lockpassword_confirm_label">Confirm</string>
<!-- Label for ChoosePassword/PIN OK button --> <!-- Label for ChoosePassword/PIN OK button -->
<string name="lockpassword_cancel_label">Cancel</string> <string name="lockpassword_cancel_label">Cancel</string>

View File

@@ -267,7 +267,7 @@ public class ChooseLockPassword extends SettingsActivity {
0, 0,
0, 0,
0, 0,
R.string.lockpassword_ok_label), R.string.lockpassword_confirm_label),
ConfirmWrong( ConfirmWrong(
R.string.lockpassword_confirm_passwords_dont_match, R.string.lockpassword_confirm_passwords_dont_match,