PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use string resources instead of literals for backup password confirmations" into jb-dev

Browse Source
This commit is contained in:
Christopher Tate
2012-06-19 16:31:11 -07:00
committed by Android (Google) Code Review
parent f4a4119eea 2d6497d2d1
commit 5739d4fe02
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -3381,6 +3381,13 @@
<!-- Summary text of the "local backup password" setting when the user has already supplied a password --> <!-- 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> <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 --> <!-- Dialog title for confirmation to erase backup data from server -->
<string name="backup_erase_dialog_title"></string> <string name="backup_erase_dialog_title"></string>
<!-- Dialog title for confirmation to erase backup data from server --> <!-- Dialog title for confirmation to erase backup data from server -->

6
src/com/android/settings/SetFullBackupPassword.java
View File

@@ -47,7 +47,7 @@ public class SetFullBackupPassword extends Activity {
// Mismatch between new pw and its confirmation re-entry // Mismatch between new pw and its confirmation re-entry
Log.i(TAG, "password mismatch"); Log.i(TAG, "password mismatch");
Toast.makeText(SetFullBackupPassword.this, Toast.makeText(SetFullBackupPassword.this,
"!!! New password and confirmation don't match !!!", R.string.local_backup_password_toast_confirmation_mismatch,
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
return; return;
} }
@@ -58,14 +58,14 @@ Log.i(TAG, "password mismatch");
// success // success
Log.i(TAG, "password set successfully"); Log.i(TAG, "password set successfully");
Toast.makeText(SetFullBackupPassword.this, Toast.makeText(SetFullBackupPassword.this,
"!!! New backup password set !!!", R.string.local_backup_password_toast_success,
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
finish(); finish();
} else { } else {
// failure -- bad existing pw, usually // failure -- bad existing pw, usually
Log.i(TAG, "failure; password mismatch?"); Log.i(TAG, "failure; password mismatch?");
Toast.makeText(SetFullBackupPassword.this, Toast.makeText(SetFullBackupPassword.this,
"!!! Failure setting backup password !!!", R.string.local_backup_password_toast_validation_failure,
Toast.LENGTH_LONG).show(); Toast.LENGTH_LONG).show();
} }
} else if (v == mCancel) { } else if (v == mCancel) {