summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-04-10 21:59:18 -0700
committerAmith Yamasani <yamasani@google.com>2013-04-10 21:59:18 -0700
commitd81a3f73680372ba93a2a26a445d148220c1a521 (patch)
treea0fc9eabf9e6e7f31d2e9eab4229926a9a0ecf37 /res
parent96cd9e7cc7d830756f42aa715e0062f938d4ae55 (diff)
downloadpackages_apps_Settings-d81a3f73680372ba93a2a26a445d148220c1a521.zip
packages_apps_Settings-d81a3f73680372ba93a2a26a445d148220c1a521.tar.gz
packages_apps_Settings-d81a3f73680372ba93a2a26a445d148220c1a521.tar.bz2
Improve app list for limited users
Show all activities in the same package with a master/slave relationship, toggling all when the master is toggled. Don't show required apps that have no restrictions. Show apps that are only installed on the target user. Bug: 8520813 lowercase app names Bug: 8520185 apps installed only in limited user Bug: 8567000 strange behavior with apps that have two launcher icons Change-Id: Id8ab296c13202735a9534f918bd81ea4b4c14b46
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4cb20c4..c266e0b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4460,6 +4460,8 @@
<string name="user_rename">RENAME</string>
<!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
<string name="app_restrictions_custom_label">Set application limits</string>
+ <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+ <string name="user_restrictions_controlled_by">Controlled by <xliff:g id="app">%1$s</xliff:g></string>
<!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
<string name="restriction_wifi_config_title">Wi\u2011Fi and Mobile</string>