diff options
| author | Jim Miller <jaggies@google.com> | 2014-08-22 22:25:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 22:25:16 +0000 |
| commit | 1351b0fbcddea9cc66941e8af1de148142b92201 (patch) | |
| tree | e0655960500b9626c7e65c2f4091af62ed314289 /res/values | |
| parent | d5ee3bc858f2e3c7e4dee6887c982c768c355c7a (diff) | |
| parent | 9d25005e7ab39bcc14722f7bdb977ceccb6107dc (diff) | |
| download | packages_apps_Settings-1351b0fbcddea9cc66941e8af1de148142b92201.zip packages_apps_Settings-1351b0fbcddea9cc66941e8af1de148142b92201.tar.gz packages_apps_Settings-1351b0fbcddea9cc66941e8af1de148142b92201.tar.bz2 | |
Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index d2e19a1..86a3903 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1103,6 +1103,9 @@ <!-- Title of preference to manage trust agents --> <string name="manage_trust_agents">Trust agents</string> + <!-- Summary shown when trust agent settings is disabled because the user hasn't set up primary security --> + <string name="disabled_because_no_backup_security">To use, first set a screen lock</string> + <!-- Summary of preference to manage device policies --> <string name="manage_trust_agents_summary">View or deactivate trust agents</string> |