Fix text styling on material preference items
b/23939702
b/23902855
Change-Id: I053267beca11842b5b685e78c9c40df36f5f1424
(cherry picked from commit 3125da26fde6fd4943e68cb1138de60bb96af967)
diff --git a/v14/preference/res/layout-v17/preference_information_material.xml b/v14/preference/res/layout-v17/preference_information_material.xml
index a376c6a..7b1d823 100644
--- a/v14/preference/res/layout-v17/preference_information_material.xml
+++ b/v14/preference/res/layout-v17/preference_information_material.xml
@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceListItem" />
+ android:textAppearance="@style/Preference_TextAppearanceMaterialSubhead" />
<TextView android:id="@android:id/summary"
android:layout_width="wrap_content"
diff --git a/v14/preference/res/layout-v17/preference_material.xml b/v14/preference/res/layout-v17/preference_material.xml
index f907d2f..bc56718 100644
--- a/v14/preference/res/layout-v17/preference_material.xml
+++ b/v14/preference/res/layout-v17/preference_material.xml
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceListItem"
+ android:textAppearance="@style/Preference_TextAppearanceMaterialSubhead"
android:ellipsize="marquee" />
<TextView android:id="@android:id/summary"
diff --git a/v14/preference/res/layout/preference_information_material.xml b/v14/preference/res/layout/preference_information_material.xml
index 54a577c..1090c61 100644
--- a/v14/preference/res/layout/preference_information_material.xml
+++ b/v14/preference/res/layout/preference_information_material.xml
@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceListItem" />
+ android:textAppearance="@style/Preference_TextAppearanceMaterialSubhead" />
<TextView android:id="@android:id/summary"
android:layout_width="wrap_content"
diff --git a/v14/preference/res/layout/preference_material.xml b/v14/preference/res/layout/preference_material.xml
index bb483c8..e25340e 100644
--- a/v14/preference/res/layout/preference_material.xml
+++ b/v14/preference/res/layout/preference_material.xml
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceListItem"
+ android:textAppearance="@style/Preference_TextAppearanceMaterialSubhead"
android:ellipsize="marquee" />
<TextView android:id="@android:id/summary"
diff --git a/v14/preference/res/values/styles.xml b/v14/preference/res/values/styles.xml
index 863d81d..eb59c34 100644
--- a/v14/preference/res/values/styles.xml
+++ b/v14/preference/res/values/styles.xml
@@ -62,8 +62,16 @@
<style name="Preference_TextAppearanceMaterialBody2">
<item name="android:textSize">14sp</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">sans-serif</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="android:textStyle">normal</item>
+ </style>
+
+ <style name="Preference_TextAppearanceMaterialSubhead">
+ <item name="android:textSize">16sp</item>
+ <item name="android:fontFamily">sans-serif</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="android:textStyle">normal</item>
</style>
</resources>