diff options
| author | Jason Monk <jmonk@google.com> | 2015-03-30 19:54:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-30 19:54:24 +0000 |
| commit | 701e55f4c0c2693f32bd95bd9b22441b5a0fb0d8 (patch) | |
| tree | db2b81fad6a980de38adaf0defa7ef1074782dc3 /res | |
| parent | f22e8c4c2e81e499ea542c272c1cc1cfee94452e (diff) | |
| parent | 2f41aa7955e27a050155765803d3a5ae98782f26 (diff) | |
| download | packages_apps_Settings-701e55f4c0c2693f32bd95bd9b22441b5a0fb0d8.zip packages_apps_Settings-701e55f4c0c2693f32bd95bd9b22441b5a0fb0d8.tar.gz packages_apps_Settings-701e55f4c0c2693f32bd95bd9b22441b5a0fb0d8.tar.bz2 | |
Merge "Add permissions screen to advanced apps"
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 9 | ||||
| -rw-r--r-- | res/xml/advanced_apps.xml | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index d87d98f..033b568 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5638,6 +5638,7 @@ <string name="keywords_keyboard_and_ime">text correction correct sound vibrate auto language gesture suggest suggestion theme offensive word type emoji international</string> <string name="keywords_reset_apps">reset preferences default</string> <string name="keywords_all_apps">apps download applications system</string> + <string name="keywords_app_permissions">apps permissions security</string> <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] --> <string name="keywords_lockscreen">slide password pattern pin</string> @@ -6136,4 +6137,12 @@ <!-- Title for profile selection dialog [CHAR LIMIT=30] --> <string name="choose_profile">Choose Profile</string> + <!-- Label for list that shows all permissions --> + <string name="app_permissions">App permissions</string> + <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] --> + <string name="app_permissions_summary"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> apps allowed additional access</string> + <!-- Summary of permissions currently granted to a single permission [CHAR + LIMIT=45] --> + <string name="app_permissions_group_summary"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> apps allowed</string> + </resources> diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml index a6cec13..e1759aa 100644 --- a/res/xml/advanced_apps.xml +++ b/res/xml/advanced_apps.xml @@ -20,6 +20,12 @@ android:key="applications_settings"> <PreferenceScreen + android:key="manage_perms" + android:fragment="com.android.settings.applications.ManagePermissions" + android:title="@string/app_permissions" + settings:keywords="@string/keywords_app_permissions" /> + + <PreferenceScreen android:key="all_apps" android:fragment="com.android.settings.applications.ManageApplications" android:title="@string/filter_all_apps" |