summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-06-12 14:07:56 -0400
committerJason Monk <jmonk@google.com>2015-06-12 14:10:48 -0400
commitf589a098e175c9779aa4ba9d4c40eea6cdafde2e (patch)
treea71a756894be9adad7649ce0d98481a44b7319ae /res/values
parentcd71d9aeabac2e7d5de7a5c84f09d4681411ebb4 (diff)
downloadandroid_packages_apps_PackageInstaller-f589a098e175c9779aa4ba9d4c40eea6cdafde2e.tar.gz
android_packages_apps_PackageInstaller-f589a098e175c9779aa4ba9d4c40eea6cdafde2e.tar.bz2
android_packages_apps_PackageInstaller-f589a098e175c9779aa4ba9d4c40eea6cdafde2e.zip
Permissions theme fixing
- Mostly just paddings a whatnot for preferences. - Also fix additional permissions screen (and its back arrow). - Keep ManagePermissions preferences around so that summary reloads aren't as painful on resume. Bug: 21636268 Bug: 21642971 Change-Id: Ibeb96ce63017c90fc37a661a6d82218b57371fb3
Diffstat (limited to 'res/values')
-rwxr-xr-xres/values/styles.xml8
-rw-r--r--res/values/themes.xml5
2 files changed, 12 insertions, 1 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c67f043a..888f9d02 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -26,4 +26,12 @@
<style name="Theme.Header.Settings" parent="@android:style/Theme.Material.Settings">
</style>
+
+ <style name="Preference">
+ <item name="android:layout">@layout/preference</item>
+ </style>
+
+ <style name="ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid">
+ <item name="android:contentInsetStart">72dp</item>
+ </style>
</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 9e8f0298..83ca6ebb 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -16,7 +16,10 @@
-->
<resources>
- <style name="Settings" parent="@android:style/Theme.Material.Settings" />
+ <style name="Settings" parent="@android:style/Theme.Material.Settings">
+ <item name="android:actionBarStyle">@style/ActionBar</item>
+ <item name="@*android:preferenceStyle">@style/Preference</item>
+ </style>
<style name="GrantPermissions"
parent="@android:style/Theme.Material.DayNight.Dialog.NoActionBar" />