summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2012-06-19 16:31:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-19 16:31:11 -0700
commit5739d4fe02c7ca4d3d939ec4f21bc9de42b8676f (patch)
tree24e5811ba38e485b6ff1c7c82bb81b466e390a0d /src
parentf4a4119eeaed1a99c082f253174b8acbca07c4c2 (diff)
parent2d6497d2d19f0cddc488ea4362221b7e08481c30 (diff)
downloadpackages_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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/SetFullBackupPassword.java6
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) {