Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow preference theming to remove divider." into nyc-mr1-dev

Browse Source
This commit is contained in:
Michael Kwan
2016-07-06 22:34:28 +00:00
committed by Android (Google) Code Review
parent e7f14ced54 908523014e
commit 929c8f4a75
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/preference/PreferenceFragment.java
View File

@@ -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();

4
core/res/res/values-watch/styles_material.xml
View File

@@ -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>

4
core/res/res/values/styles_material.xml
View File

@@ -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>