From ac8024ef44d9b8ae6c2826148d860b27f26c826d Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 18 Oct 2017 16:16:35 -0700 Subject: [PATCH] Update confirm button label Test: Existing tests pass Bug: 65123475 Change-Id: Ib730507db54fe2bab881fa040ead737c6736ee1a --- res/values/strings.xml | 4 ++-- src/com/android/settings/password/ChooseLockPassword.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 9687bf224c1..0f5a751f942 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1379,8 +1379,8 @@ Ascending, descending, or repeated sequence of digits isn\'t allowed - - OK + + Confirm Cancel diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 9f5192d0441..e5fbe6c40f5 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -267,7 +267,7 @@ public class ChooseLockPassword extends SettingsActivity { 0, 0, 0, - R.string.lockpassword_ok_label), + R.string.lockpassword_confirm_label), ConfirmWrong( R.string.lockpassword_confirm_passwords_dont_match,