Merge "Disable trust agent settings when disabled by policy"

This commit is contained in:
Adrian Roos
2015-04-14 00:32:35 +00:00
committed by Android (Google) Code Review
4 changed files with 36 additions and 4 deletions

View File

@@ -6274,6 +6274,9 @@
<!-- Description for advanced menu option to reset app preferences [CHAR LIMIT=NONE] -->
<string name="reset_app_preferences_description">Reset preferences across all apps to defaults</string>
<!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
<string name="trust_agent_disabled_device_admin">Disabled by administrator</string>
<!-- Description of settings item that leads to list of all apps [CHAR LIMIT=NONE] -->
<string name="all_apps_summary"><xliff:g id="count" example="10">%d</xliff:g> apps installed, including system and downloaded apps</string>