diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-08-25 08:24:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-25 08:24:27 +0000 |
| commit | 5432052f6830dec55f066b0b1d5b69d6a4c12e55 (patch) | |
| tree | 147148cca7cda09b766ba28be1117fce860a839b /packages/BackupRestoreConfirmation/res | |
| parent | d308790da6fbb02ea5149bafd42460df94831d91 (diff) | |
| parent | d70c21d61666b3d8235bceb9ca6db21806022b71 (diff) | |
| download | frameworks_base-5432052f6830dec55f066b0b1d5b69d6a4c12e55.zip frameworks_base-5432052f6830dec55f066b0b1d5b69d6a4c12e55.tar.gz frameworks_base-5432052f6830dec55f066b0b1d5b69d6a4c12e55.tar.bz2 | |
am bee67db7: am f1b2348d: am b34de6be: Merge "Fix adb backup for encrypted case" into lmp-dev
* commit 'bee67db720e33f830714f4bada6f712a25dd7fad':
Fix adb backup for encrypted case
Diffstat (limited to 'packages/BackupRestoreConfirmation/res')
| -rw-r--r-- | packages/BackupRestoreConfirmation/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/BackupRestoreConfirmation/res/values/strings.xml b/packages/BackupRestoreConfirmation/res/values/strings.xml index 5c90fd0..3fb3fd4 100644 --- a/packages/BackupRestoreConfirmation/res/values/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values/strings.xml @@ -44,6 +44,8 @@ <string name="backup_enc_password_text">Please enter a password to use for encrypting the full backup data. If this is left blank, your current backup password will be used:</string> <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. --> <string name="backup_enc_password_optional">If you wish to encrypt the full backup data, enter a password below:</string> + <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. --> + <string name="backup_enc_password_required">Since your device is encrypted, you are required to encrypt your backup. Please enter a password below:</string> <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. --> <string name="restore_enc_password_text">If the restore data is encrypted, please enter the password below:</string> |