Update preference category theme.
This aligns the headers with the preference category items, and removes
lines between items.
Fix: 62486696
Fix: 62486046
Test: runtest --path packages/apps/EmergencyInfo/tests/
Change-Id: I74fa1b444c061aa142563bdbc739824ce9b72207
diff --git a/res/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
new file mode 100644
index 0000000..81ee58d
--- /dev/null
+++ b/res/layout/preference_category_material_settings.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!-- Based off frameworks/base/core/res/res/layout/preference_category_material.xml
+ except that this supports icon -->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart" >
+
+ <LinearLayout
+ android:id="@+id/icon_container"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="start|center_vertical"
+ android:orientation="horizontal">
+ <com.android.internal.widget.PreferenceImageView
+ android:id="@android:id/icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:tint="?android:attr/textColorPrimary"
+ android:maxWidth="18dp"
+ android:maxHeight="18dp"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="56dp"
+ android:orientation="vertical">
+ <TextView
+ android:id="@android:id/title"
+ android:layout_marginTop="16dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@android:style/TextAppearance.Material.Body2"
+ android:textColor="?android:attr/colorAccent"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>
+ <TextView
+ android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+ android:textColor="?android:attr/textColorSecondary"
+ android:ellipsize="end"
+ android:singleLine="true" />
+ </LinearLayout>
+
+</FrameLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a2e6437..cda3027 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -63,10 +63,16 @@
<!-- Parent path frameworks/support/v14/preference/res/values/themes.xml -->
<item name="android:scrollbars">vertical</item>
<item name="footerPreferenceStyle">@style/FooterPreference</item>
+ <item name="preferenceCategoryStyle">@style/PreferenceCategory</item>
</style>
<style name="FooterPreference" parent="PreferenceTheme">
<item name="android:layout">@layout/preference_footer</item>
<item name="allowDividerAbove">true</item>
</style>
+
+ <style name="PreferenceCategory" parent="@style/Preference.Category.Material">
+ <item name="allowDividerAbove">true</item>
+ <item name="android:layout">@layout/preference_category_material_settings</item>
+ </style>
</resources>
