commit 4da34bcdcfd407afaba97ba08886e4a43b843f0b
author Hyunyoung Song <hyunyoungs@google.com> Mon May 13 23:31:20 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 13 23:31:20 2019 +0000
tree 580d46978e6778b74a262cd748f54ba7c898682f
parent 1d2d2edd175e10456574c74578d9e800c67cf45c
parent 3cd88084712772f6bb59ceb3844011a01bd15e80

Merge "Headline font should not be Medium type" into ub-launcher3-qt-dev

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7ccdbe2..7857247 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -46,7 +46,7 @@
         <item name="android:background">?android:colorPrimary</item>
     </style>
 
-    <style name="BottomNavTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+    <style name="BottomNavTextAppearance" parent="HeaderTextAppearance">
         <item name="android:textSize">@dimen/bottom_navbar_font_text_size</item>
     </style>
     <style name="RegularToolbarStyle" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
@@ -55,13 +55,15 @@
         <item name="android:theme">@style/WallpaperTheme</item>
     </style>
 
-    <style name="HeaderTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"/>
+    <style name="HeaderTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+        <item name="android:textFontWeight">400</item>
+    </style>
 
     <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
 
     <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button.Borderless.Colored"/>
 
-    <style name="OptionTitleTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+    <style name="OptionTitleTextAppearance" parent="HeaderTextAppearance">
         <item name="android:textColor">@color/option_title_color</item>
         <item name="android:textAlignment">center</item>
         <item name="android:textSize">@dimen/theme_option_title_font_text_size</item>
@@ -81,7 +83,7 @@
         <item name="cardBackgroundColor">?android:colorPrimary</item>
     </style>
 
-    <style name="CardTitleTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
+    <style name="CardTitleTextAppearance" parent="HeaderTextAppearance">
         <item name="android:textStyle">bold</item>
         <item name="android:textSize">@dimen/card_title_text_size</item>
     </style>
@@ -90,9 +92,8 @@
         <item name="android:textSize">@dimen/card_cover_title_text_size</item>
     </style>
 
-    <style name="FontCardTitleStyle">
+    <style name="FontCardTitleStyle" parent="HeaderTextAppearance">
         <item name="android:textAlignment">center</item>
-        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title</item>
     </style>
 
     <style name="FontCardBodyTextStyle">