From 41435ad0ea0a474fbb018a09081ec5109fa9a4ac Mon Sep 17 00:00:00 2001
From: Raff Tsai <rafftsai@google.com>
Date: Mon, 13 Jan 2020 03:07:00 +0800
Subject: [PATCH] Fix layout issues

- Add fontFamily in TextAppearance.Tab to support change font style
- Overwrite TabTheme to change overscroll effect color

Fixes: 147134904
Fixes: 147136108
Test: manual
Change-Id: Iebb2dea658a295f3c6ece900680f42fb3a772cb4
---
 res/layout/preference_list_fragment.xml | 2 +-
 res/values-night/themes.xml             | 4 ++++
 res/values/styles.xml                   | 3 ++-
 res/values/themes.xml                   | 4 ++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index edf9a7c8fbe..c673bc3c4c0 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -52,7 +52,7 @@
         android:visibility="gone" />
 
     <LinearLayout
-        android:theme="@style/Theme.MaterialComponents.DayNight"
+        android:theme="@style/Theme.TabTheme"
         android:id="@+id/tab_container"
         android:clipToPadding="true"
         android:clipChildren="true"
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index ec0978b3391..c5f67febfa9 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -40,4 +40,8 @@
         <item name="android:colorBackground">@color/dialog_background</item>
     </style>
 
+    <!-- Material theme for the pages containing TabLayout and ViewPager -->
+    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
+        <item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>
+    </style>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 47e96d829e7..05191b82c4f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -564,8 +564,9 @@
         <item name="android:showDividers">middle</item>
     </style>
 
-    <style name="TextAppearance.Tab" parent="@android:style/TextAppearance.DeviceDefault">
+    <style name="TextAppearance.Tab" parent="@android:style/TextAppearance.DeviceDefault.Medium">
         <item name="android:textAllCaps">false</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
     </style>
 
     <style name="AccessibilityDialogServiceIcon">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 9c50ceb7029..76d6e38757c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -253,4 +253,8 @@
         <item name="android:colorPrimaryDark">@android:color/white</item>
         <item name="android:colorAccent">@color/material_blue_700</item>
     </style>
+    <!-- Material theme for the pages containing TabLayout and ViewPager -->
+    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
+        <item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>
+    </style>
 </resources>