diff options
| author | 2016-07-02 19:31:32 -0700 | |
|---|---|---|
| committer | 2016-07-02 19:31:32 -0700 | |
| commit | 908523014e8cdc04c65c85a95be0c8ca98113c06 (patch) | |
| tree | 97bb724cd607ee0fcce7e66d78c4e37d5f8f9c8d | |
| parent | c7b1d74ae8a2a34768348da47dce50d7c45cb323 (diff) | |
Allow preference theming to remove divider.
Bug: 27962897
Change-Id: I6632f2a3c3d1290c472594f127ad33c9b85023f1
| -rw-r--r-- | core/java/android/preference/PreferenceFragment.java | 10 | ||||
| -rw-r--r-- | core/res/res/values-watch/styles_material.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/styles_material.xml | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java index 3e496b6eb550..d4a3582cfbf6 100644 --- a/core/java/android/preference/PreferenceFragment.java +++ b/core/java/android/preference/PreferenceFragment.java @@ -189,12 +189,10 @@ public abstract class PreferenceFragment extends Fragment implements 0); ListView lv = (ListView) view.findViewById(android.R.id.list); - if (lv != null) { - Drawable divider = - a.getDrawable(com.android.internal.R.styleable.PreferenceFragment_divider); - if (divider != null) { - lv.setDivider(divider); - } + if (lv != null + && a.hasValueOrEmpty(com.android.internal.R.styleable.PreferenceFragment_divider)) { + lv.setDivider( + a.getDrawable(com.android.internal.R.styleable.PreferenceFragment_divider)); } a.recycle(); diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml index c19cc72a8bff..daeeca2b050d 100644 --- a/core/res/res/values-watch/styles_material.xml +++ b/core/res/res/values-watch/styles_material.xml @@ -53,6 +53,10 @@ please see styles_device_defaults.xml. <item name="wallpaperIntraCloseExitAnimation">@anim/slide_in_exit_micro</item> </style> + <style name="PreferenceFragment.Material" parent="BasePreferenceFragment"> + <item name="divider">@empty</item> + </style> + <style name="Widget.Material.TextView" parent="Widget.TextView"> <item name="breakStrategy">balanced</item> </style> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 6e0ad3681e81..fad3488d2915 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -36,7 +36,7 @@ please see styles_device_defaults.xml. <item name="layout">@layout/preference_material</item> </style> - <style name="PreferenceFragment.Material"> + <style name="BasePreferenceFragment"> <item name="layout">@layout/preference_list_fragment_material</item> <item name="paddingStart">@dimen/preference_fragment_padding_side_material</item> <item name="paddingEnd">@dimen/preference_fragment_padding_side_material</item> @@ -46,6 +46,8 @@ please see styles_device_defaults.xml. <item name="clipToPadding">@bool/config_preferenceFragmentClipToPadding</item> </style> + <style name="PreferenceFragment.Material" parent="BasePreferenceFragment"/> + <style name="PreferenceActivity.Material"> <item name="layout">@layout/preference_list_content_material</item> <item name="headerLayout">@layout/preference_header_item_material</item> |