diff options
| author | Lucky Zhang <luckyzh@google.com> | 2014-12-03 00:32:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 00:32:01 +0000 |
| commit | 97f70e72638b822f09e9ba23a70d31057147c6cd (patch) | |
| tree | 6bf6c2e9b8d3061936463b4834930fac9c7e45be /res | |
| parent | 1d0667a07b09771cca05f0d6f7d89c018ff88575 (diff) | |
| parent | 23ab054dd94a639ca43e011b931eb12c5122c596 (diff) | |
| download | packages_apps_Settings-97f70e72638b822f09e9ba23a70d31057147c6cd.zip packages_apps_Settings-97f70e72638b822f09e9ba23a70d31057147c6cd.tar.gz packages_apps_Settings-97f70e72638b822f09e9ba23a70d31057147c6cd.tar.bz2 | |
am 23ab054d: am 955f412c: am 91177d1c: Merge "[FRP] Show FRP warning when disabling secure unlock" into lmp-mr1-dev
* commit '23ab054dd94a639ca43e011b931eb12c5122c596':
[FRP] Show FRP warning when disabling secure unlock
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 881fea3..be99063 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -958,6 +958,9 @@ <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] --> <string name="unlock_set_unlock_password_summary">High security</string> + <!-- Content of warning dialog about disabling device protection features when user is switching from a secure unlock method to an insecure one. [CHAR LIMIT=NONE] --> + <string name="unlock_disable_frp_warning_content">Device protection features will no longer work.</string> + <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] --> <string name="unlock_set_unlock_disabled_summary">Disabled by administrator, encryption policy, or credential storage</string> @@ -983,6 +986,8 @@ <string name="unlock_disable_lock_pin_summary">Remove unlock PIN</string> <!-- Summary shown under unlock_disable_lock_title when password is in use and can be removed [CHAR LIMIT=45]--> <string name="unlock_disable_lock_password_summary">Remove unlock password</string> + <!-- Summary shown under unlock_disable_lock_title when an unknown secure unlocking method is in use and can be removed [CHAR LIMIT=45]--> + <string name="unlock_disable_lock_unknown_summary">Remove screen lock</string> <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] --> <string name="unlock_change_lock_pattern_title">Change unlock pattern</string> |