diff options
| author | Christopher Tate <ctate@google.com> | 2012-06-19 16:31:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-19 16:31:11 -0700 |
| commit | 5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f (patch) | |
| tree | 24e5811ba38e485b6ff1c7c82bb81b466e390a0d | |
| parent | f4a4119eeaed1a99c082f253174b8acbca07c4c2 (diff) | |
| parent | 2d6497d2d19f0cddc488ea4362221b7e08481c30 (diff) | |
| download | packages_apps_settings-5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f.zip packages_apps_settings-5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f.tar.gz packages_apps_settings-5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f.tar.bz2 | |
Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | src/com/android/settings/SetFullBackupPassword.java | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 00ed06b..41d562f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3381,6 +3381,13 @@ <!-- Summary text of the "local backup password" setting when the user has already supplied a password --> <string name="local_backup_password_summary_change">Touch to change or remove the password for desktop full backups</string> + <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] --> + <string name="local_backup_password_toast_success">New backup password set</string> + <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] --> + <string name="local_backup_password_toast_confirmation_mismatch">New password and confirmation don\'t match</string> + <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] --> + <string name="local_backup_password_toast_validation_failure">Failure setting backup password</string> + <!-- Dialog title for confirmation to erase backup data from server --> <string name="backup_erase_dialog_title"></string> <!-- Dialog title for confirmation to erase backup data from server --> diff --git a/src/com/android/settings/SetFullBackupPassword.java b/src/com/android/settings/SetFullBackupPassword.java index 9f3f29f..4ab096b 100644 --- a/src/com/android/settings/SetFullBackupPassword.java +++ b/src/com/android/settings/SetFullBackupPassword.java @@ -47,7 +47,7 @@ public class SetFullBackupPassword extends Activity { // Mismatch between new pw and its confirmation re-entry Log.i(TAG, "password mismatch"); Toast.makeText(SetFullBackupPassword.this, - "!!! New password and confirmation don't match !!!", + R.string.local_backup_password_toast_confirmation_mismatch, Toast.LENGTH_LONG).show(); return; } @@ -58,14 +58,14 @@ Log.i(TAG, "password mismatch"); // success Log.i(TAG, "password set successfully"); Toast.makeText(SetFullBackupPassword.this, - "!!! New backup password set !!!", + R.string.local_backup_password_toast_success, Toast.LENGTH_LONG).show(); finish(); } else { // failure -- bad existing pw, usually Log.i(TAG, "failure; password mismatch?"); Toast.makeText(SetFullBackupPassword.this, - "!!! Failure setting backup password !!!", + R.string.local_backup_password_toast_validation_failure, Toast.LENGTH_LONG).show(); } } else if (v == mCancel) { |