diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-09 20:10:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 20:10:34 +0000 |
| commit | fc2584fdfb919251c759e973970a846212bb2919 (patch) | |
| tree | cf8a4f25d721a5b0e43f976ef14dd6c652125894 /res/values | |
| parent | 802ba34d97ce610f124cef4031a538f1d88d374d (diff) | |
| parent | 9dac63903713928e7bab2817e972862cb03df993 (diff) | |
| download | android_packages_apps_PackageInstaller-fc2584fdfb919251c759e973970a846212bb2919.tar.gz android_packages_apps_PackageInstaller-fc2584fdfb919251c759e973970a846212bb2919.tar.bz2 android_packages_apps_PackageInstaller-fc2584fdfb919251c759e973970a846212bb2919.zip | |
am 9dac6390: am d045b7a3: am c1324cf3: am f80e0f06: am 5349ac88: Merge "Add all permissions screen" into mnc-dev
* commit '9dac63903713928e7bab2817e972862cb03df993':
Add all permissions screen
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 5 | ||||
| -rwxr-xr-x | res/values/styles.xml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 5185d6e0..5916efb6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -259,4 +259,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> |