summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-06-22 12:15:38 -0400
committerJason Monk <jmonk@google.com>2015-07-08 11:19:18 -0400
commitf6a05cd23ea6db4e6c546290ba1f91a300a73400 (patch)
tree06f241c9bef908c83d10cd37b024c4ab5e2fb318 /res/values
parent9ef638e53f9ae1c8f059a17d3cef27d89187b454 (diff)
downloadandroid_packages_apps_PackageInstaller-f6a05cd23ea6db4e6c546290ba1f91a300a73400.tar.gz
android_packages_apps_PackageInstaller-f6a05cd23ea6db4e6c546290ba1f91a300a73400.tar.bz2
android_packages_apps_PackageInstaller-f6a05cd23ea6db4e6c546290ba1f91a300a73400.zip
Add all permissions screen
Bug: 21268041 Change-Id: I51674ffbd252bf4585a992f8cc9e43973ce43512
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml5
-rwxr-xr-xres/values/styles.xml5
2 files changed, 10 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2e23df01..cbe193e2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -256,4 +256,9 @@
<!-- Text displayed until loading is done -->
<string name="loading">Loading\u2026</string>
+ <!-- [CHAR LIMIT=45] Title of all permissions settings -->
+ <string name="all_permissions">All permissions</string>
+ <!-- [CHAR LIMIT=45] Group of permissions granted to app automatically when installed. -->
+ <string name="other_permissions">Other app capabilities</string>
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e800b56f..6d772910 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,6 +29,7 @@
<style name="PreferenceThemeOverlay.v14.Permissions">
<item name="preferenceStyle">@style/Preference.Permissions</item>
+ <item name="preferenceCategoryStyle">@style/Preference.Category.Permissions</item>
<item name="switchPreferenceStyle">@style/Preference.SwitchPreference.Permissions</item>
</style>
@@ -36,6 +37,10 @@
<item name="layout">@layout/preference_permissions</item>
</style>
+ <style name="Preference.Category.Permissions">
+ <item name="layout">@layout/preference_category_material</item>
+ </style>
+
<style name="Preference.SwitchPreference.Permissions">
<item name="layout">@layout/preference_permissions_switch</item>
</style>