diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-16 13:17:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-16 13:17:02 +0000 |
| commit | 744f2adb56ac0077a103c8e6e3b20f421eddc780 (patch) | |
| tree | 7b67b635bf631748316ea76025d8f760c97843e7 /res/values | |
| parent | 9a5550e9e6efe211b03d067eae2689f6ef5eb2d1 (diff) | |
| parent | 2cdafc6be386bb767404e42fc728a1a810aa896a (diff) | |
| download | packages_apps_Settings-744f2adb56ac0077a103c8e6e3b20f421eddc780.zip packages_apps_Settings-744f2adb56ac0077a103c8e6e3b20f421eddc780.tar.gz packages_apps_Settings-744f2adb56ac0077a103c8e6e3b20f421eddc780.tar.bz2 | |
Merge "Layout refinement for app lists" into mnc-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/styles.xml | 6 | ||||
| -rw-r--r-- | res/values/themes.xml | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 1b7caf7..d24337f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -93,6 +93,10 @@ <item name="android:windowContentOverlay">@null</item> </style> + <style name="Preference"> + <item name="android:layout">@layout/preference_material_settings</item> + </style> + <style name="PreferenceHeaderPanelSinglePane"> <item name="android:layout_marginStart">0dp</item> <item name="android:layout_marginEnd">0dp</item> @@ -339,4 +343,4 @@ <item name="android:textSize">16sp</item> <item name="android:textColor">?android:attr/textColorPrimary</item> </style> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/themes.xml b/res/values/themes.xml index 08b8de3..e6621a8 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -80,6 +80,7 @@ <style name="Theme.SettingsBase" parent="@android:style/Theme.Material.Settings" /> <style name="Theme.Settings" parent="Theme.SettingsBase"> + <item name="@*android:preferenceStyle">@style/Preference</item> <item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item> <item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item> <item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item> |