Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4da34bcd authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

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

parents 1d2d2edd 3cd88084

res/values/styles.xml

+7 −6
Original line number Diff line number Diff line
@@ -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">