summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-02-14 17:25:01 -0800
committerJim Miller <jaggies@google.com>2011-02-14 17:58:10 -0800
commit9afb14de3b8bbc8c3905926eb3765a65c414e414 (patch)
treebe329bc30c7333d2feeb77bc5f69fde7952f6a94
parentcd44f206e025acd9df27b10d7f294f9f9d0302bf (diff)
downloadpackages_apps_Settings-9afb14de3b8bbc8c3905926eb3765a65c414e414.tar.gz
packages_apps_Settings-9afb14de3b8bbc8c3905926eb3765a65c414e414.tar.bz2
packages_apps_Settings-9afb14de3b8bbc8c3905926eb3765a65c414e414.zip
Fix 3444669: Fix message string for max password length
Change-Id: I5828dc0127b0296d87bdc0c9e251fd9c9a92bd0d
-rw-r--r--res/values/strings.xml4
-rw-r--r--src/com/android/settings/ChooseLockPassword.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b8bd7b1d7..228504e63 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -781,9 +781,9 @@
<string name="lockpassword_continue_label">Continue</string>
<!-- Error shown in popup when password is too long -->
- <string name="lockpassword_password_too_long">PIN can be no longer than %d digits</string>
+ <string name="lockpassword_password_too_long">Password must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters</string>
<!-- Error shown in popup when PIN is too long -->
- <string name="lockpassword_pin_too_long">PIN can be no longer than %d digits</string>
+ <string name="lockpassword_pin_too_long">PIN must be fewer than <xliff:g id="number" example="17">%d</xliff:g> digits</string>
<!-- Error shown when in PIN mode and user enters a non-digit -->
<string name="lockpassword_pin_contains_non_digits">PIN must contain only digits 0-9</string>
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 018dfd2aa..a0f23465e 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -274,7 +274,7 @@ public class ChooseLockPassword extends PreferenceActivity {
if (password.length() > mPasswordMaxLength) {
return getString(mIsAlphaMode ?
R.string.lockpassword_password_too_long
- : R.string.lockpassword_pin_too_long, mPasswordMaxLength);
+ : R.string.lockpassword_pin_too_long, mPasswordMaxLength + 1);
}
int letters = 0;
int numbers = 0;