summaryrefslogtreecommitdiffstats
path: root/packages/BackupRestoreConfirmation/res
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2014-08-23 20:50:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-23 20:50:23 +0000
commitb8f7ecf9e4f0a3fe1da26d7a556573b2a1c603a6 (patch)
tree831b10aea0502f3b42c39819a29ddacdb846ea43 /packages/BackupRestoreConfirmation/res
parentddb794775af1386d8ce553c2d11080536cf85734 (diff)
parentb8e6838583c9d784a7e8d030999d57eb2e87a561 (diff)
downloadframeworks_base-b8f7ecf9e4f0a3fe1da26d7a556573b2a1c603a6.zip
frameworks_base-b8f7ecf9e4f0a3fe1da26d7a556573b2a1c603a6.tar.gz
frameworks_base-b8f7ecf9e4f0a3fe1da26d7a556573b2a1c603a6.tar.bz2
am b34de6be: Merge "Fix adb backup for encrypted case" into lmp-dev
* commit 'b34de6be2ede2e31a79958d6a2e6c53761c92d04': Fix adb backup for encrypted case
Diffstat (limited to 'packages/BackupRestoreConfirmation/res')
-rw-r--r--packages/BackupRestoreConfirmation/res/values/strings.xml2
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>