From 4b6a1a53acd1d10798fc3e0763f002266811037e Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Tue, 11 Feb 2020 16:36:35 +0800
Subject: [PATCH] Change the font weight of the slice title to medium

Test: visual
Fixes: 139017680
Change-Id: I347239f2c164c871eced2fbda1b2faaa38e16ca9
---
 res/layout/conditional_card_full_tile.xml   | 2 +-
 res/layout/conditional_card_half_tile.xml   | 2 +-
 res/layout/contextual_slice_full_tile.xml   | 1 +
 res/layout/contextual_slice_half_tile.xml   | 2 +-
 res/layout/contextual_slice_sticky_tile.xml | 1 +
 res/values/styles.xml                       | 2 +-
 res/values/themes.xml                       | 4 ++++
 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/res/layout/conditional_card_full_tile.xml b/res/layout/conditional_card_full_tile.xml
index 81889fb3efc..4c0da17a6a9 100644
--- a/res/layout/conditional_card_full_tile.xml
+++ b/res/layout/conditional_card_full_tile.xml
@@ -57,7 +57,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/contextual_condition_card_title_margin_bottom"
-                    android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
+                    android:textAppearance="@style/TextAppearance.HomepageCardTitle"/>
 
                 <TextView
                     android:id="@android:id/summary"
diff --git a/res/layout/conditional_card_half_tile.xml b/res/layout/conditional_card_half_tile.xml
index 9bbaf8641c0..6f83ef3fd84 100644
--- a/res/layout/conditional_card_half_tile.xml
+++ b/res/layout/conditional_card_half_tile.xml
@@ -51,7 +51,7 @@
                 android:layout_marginStart="@dimen/contextual_card_text_padding_start"
                 android:layout_marginTop="@dimen/contextual_condition_half_card_title_margin_top"
                 android:layout_marginBottom="@dimen/contextual_condition_card_title_margin_bottom"
-                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
+                android:textAppearance="@style/TextAppearance.HomepageCardTitle"/>
 
             <TextView
                 android:id="@android:id/summary"
diff --git a/res/layout/contextual_slice_full_tile.xml b/res/layout/contextual_slice_full_tile.xml
index b67b7775a03..1438cfb1c32 100644
--- a/res/layout/contextual_slice_full_tile.xml
+++ b/res/layout/contextual_slice_full_tile.xml
@@ -29,6 +29,7 @@
 
         <androidx.slice.widget.SliceView
             android:id="@+id/slice_view"
+            android:theme="@style/Theme.Settings.ContextualCard"
             style="@style/ContextualCardSliceViewStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/contextual_slice_half_tile.xml b/res/layout/contextual_slice_half_tile.xml
index 490b0ac8d8e..d2011ad2e64 100644
--- a/res/layout/contextual_slice_half_tile.xml
+++ b/res/layout/contextual_slice_half_tile.xml
@@ -52,7 +52,7 @@
                 android:ellipsize="end"
                 android:layout_marginStart="@dimen/contextual_card_text_padding_start"
                 android:layout_marginTop="@dimen/contextual_half_card_title_margin_top"
-                android:textAppearance="@style/TextAppearance.ConditionCardTitle"/>
+                android:textAppearance="@style/TextAppearance.HomepageCardTitle"/>
 
         </LinearLayout>
 
diff --git a/res/layout/contextual_slice_sticky_tile.xml b/res/layout/contextual_slice_sticky_tile.xml
index 8e82f5339a0..117732d929c 100644
--- a/res/layout/contextual_slice_sticky_tile.xml
+++ b/res/layout/contextual_slice_sticky_tile.xml
@@ -23,6 +23,7 @@
 
     <androidx.slice.widget.SliceView
         android:id="@+id/slice_view"
+        android:theme="@style/Theme.Settings.ContextualCard"
         style="@style/ContextualCardSliceViewStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a4c82b29a91..02998ae466c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -274,7 +274,7 @@
         <item name="android:textSize">@dimen/search_bar_text_size</item>
     </style>
 
-    <style name="TextAppearance.ConditionCardTitle"
+    <style name="TextAppearance.HomepageCardTitle"
            parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
         <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
         <item name="android:textSize">16sp</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 76d6e38757c..172a89a7351 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -210,6 +210,10 @@
         <item name="android:windowBackground">@android:color/white</item>
     </style>
 
+    <style name="Theme.Settings.ContextualCard" parent="Theme.Settings.Home">
+        <item name="android:textAppearanceListItem">@style/TextAppearance.HomepageCardTitle</item>
+    </style>
+
     <!-- Note that Dialog themes do not set list dividers -->
     <style name="Theme.Panel" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog">
         <item name="android:windowBackground">@null</item>