diff options
| author | Christopher Tate <ctate@google.com> | 2012-06-19 16:34:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-19 16:34:01 -0700 |
| commit | 1b4a9b4107c1d6ba5b2ecf5657865acc24a28686 (patch) | |
| tree | 3a87d93b2d95b43509200d2b9d3e1cf52f737796 /src/com/android | |
| parent | e5d2b8b8ab0d9968c976f584917481f46995f65c (diff) | |
| parent | 5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f (diff) | |
| download | packages_apps_settings-1b4a9b4107c1d6ba5b2ecf5657865acc24a28686.zip packages_apps_settings-1b4a9b4107c1d6ba5b2ecf5657865acc24a28686.tar.gz packages_apps_settings-1b4a9b4107c1d6ba5b2ecf5657865acc24a28686.tar.bz2 | |
am 5739d4fe: Merge "Use string resources instead of literals for backup password confirmations" into jb-dev
* commit '5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f':
Use string resources instead of literals for backup password confirmations
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/SetFullBackupPassword.java | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |