Merge "Use same section header text color on tablets" into lmp-dev
diff --git a/res/layout/edit_kind_title.xml b/res/layout/edit_kind_title.xml
index 1392ac4..b7de66f 100644
--- a/res/layout/edit_kind_title.xml
+++ b/res/layout/edit_kind_title.xml
@@ -28,7 +28,7 @@
android:focusable="false">
<TextView
android:id="@+id/kind_title"
- style="@style/ContactListSeparatorTextViewStyle"
+ style="@style/EditKindSeparatorTextViewStyle"
android:paddingLeft="8dip"
android:paddingRight="8dip"
android:paddingStart="8dip"
diff --git a/res/values-sw720dp/integers.xml b/res/values-sw720dp/integers.xml
index c629f7e..7c94a14 100644
--- a/res/values-sw720dp/integers.xml
+++ b/res/values-sw720dp/integers.xml
@@ -14,5 +14,8 @@
limitations under the License.
-->
<resources>
+ <!-- Determines the number of columns in a ContactTileRow in the favorites tab -->
+ <integer name="contact_tile_column_count_in_favorites">3</integer>
+
<integer name="contact_tile_column_count">2</integer>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 12fafbc..85cfbd3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -273,4 +273,16 @@
will look ridiculous. -->
<item name="android:stateListAnimator">@null</item>
</style>
+
+ <style name="EditKindSeparatorTextViewStyle" parent="ContactListSeparatorTextViewStyle">
+ <item name="android:textAppearance">@style/EditKindTextAppearanceStyle</item>
+ </style>
+
+ <style name="EditKindTextAppearanceStyle" parent="@android:style/TextAppearance.Small">
+ <item name="android:textSize">14sp</item>
+ <item name="android:textStyle">bold</item>
+ <item name="android:textAllCaps">true</item>
+ <item name="android:textColor">#363636</item>
+ <item name="android:fontFamily">sans-serif</item>
+ </style>
</resources>