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

Commit 2aeeeaef authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Update all TextAppearance.DeviceDefault styles. 

- Directly reference either config_{body,headline}FontFamily attributes
instead of relying on the fontFamily set by material themes (note that
this patch does not actually change any of the fonts for these styles)
- This enables RROs to overlay only config_{body,headline}FontFamily
to change all of TextAppearance.DeviceDefault* styles

Bug: 119878221
Test: manual
Change-Id: I13938985d9492ecf7e7f43d3aebb8498ca458d6a
parent 37fa1033

core/res/res/values/config.xml

+7 −1
Original line number Original line Diff line number Diff line
@@ -3495,7 +3495,13 @@ 
    <!-- Controls whether system buttons use all caps for text -->

    <!-- Controls whether system buttons use all caps for text -->

    <bool name="config_buttonTextAllCaps">true</bool>

    <bool name="config_buttonTextAllCaps">true</bool>

    <!-- Name of the font family used for system surfaces where the font should use medium weight -->

    <!-- Name of the font family used for system surfaces where the font should use medium weight -->

    <string name="config_headlineFontFamilyMedium">@string/font_family_button_material</string>

    <string name="config_headlineFontFamilyMedium" translateable="false">@string/font_family_button_material</string>

    <!-- Name of a font family to use for body text. -->

    <string name="config_bodyFontFamily" translatable="false">sans-serif</string>

    <!-- Name of a font family to use for light body text. -->

    <string name="config_bodyFontFamilyLight" translatable="false">sans-serif-light</string>

    <!-- Name of a font family to use for medium body text. -->

    <string name="config_bodyFontFamilyMedium" translatable="false">sans-serif-medium</string>





    <!-- Size of icon shown beside a preference locked by admin -->

    <!-- Size of icon shown beside a preference locked by admin -->

    <dimen name="config_restrictedIconSize">@dimen/restricted_icon_size_material</dimen>

    <dimen name="config_restrictedIconSize">@dimen/restricted_icon_size_material</dimen>

core/res/res/values/styles_device_defaults.xml

+98 −39
Original line number Original line Diff line number Diff line
@@ -227,51 +227,100 @@ easier. 
    <style name="Widget.DeviceDefault.Light.TimePicker" parent="Widget.Material.Light.TimePicker"/>

    <style name="Widget.DeviceDefault.Light.TimePicker" parent="Widget.Material.Light.TimePicker"/>





    <!-- Text Appearance Styles -->

    <!-- Text Appearance Styles -->

    <style name="TextAppearance.DeviceDefault" parent="TextAppearance.Material"/>

    <style name="TextAppearance.DeviceDefault" parent="TextAppearance.Material">

    <style name="TextAppearance.DeviceDefault.Inverse" parent="TextAppearance.Material.Inverse"/>

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    <style name="TextAppearance.DeviceDefault.Large" parent="TextAppearance.Material.Large"/>

    </style>

    <style name="TextAppearance.DeviceDefault.Large.Inverse" parent="TextAppearance.Material.Large.Inverse"/>

    <style name="TextAppearance.DeviceDefault.Inverse" parent="TextAppearance.Material.Inverse">

    <style name="TextAppearance.DeviceDefault.Medium" parent="TextAppearance.Material.Medium"/>

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    <style name="TextAppearance.DeviceDefault.Medium.Inverse" parent="TextAppearance.Material.Medium.Inverse"/>

    </style>

    <style name="TextAppearance.DeviceDefault.Small" parent="TextAppearance.Material.Small"/>

    <style name="TextAppearance.DeviceDefault.Large" parent="TextAppearance.Material.Large">

    <style name="TextAppearance.DeviceDefault.Small.Inverse" parent="TextAppearance.Material.Small.Inverse"/>

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    <style name="TextAppearance.DeviceDefault.SearchResult.Title" parent="TextAppearance.Material.SearchResult.Title"/>

    </style>

    <style name="TextAppearance.DeviceDefault.SearchResult.Subtitle" parent="TextAppearance.Material.SearchResult.Subtitle"/>

    <style name="TextAppearance.DeviceDefault.Large.Inverse" parent="TextAppearance.Material.Large.Inverse">

    <style name="TextAppearance.DeviceDefault.Widget" parent="TextAppearance.Material.Widget"/>

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Medium" parent="TextAppearance.Material.Medium">

        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Medium.Inverse" parent="TextAppearance.Material.Medium.Inverse">

        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Small" parent="TextAppearance.Material.Small">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Small.Inverse" parent="TextAppearance.Material.Small.Inverse">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.SearchResult.Title" parent="TextAppearance.Material.SearchResult.Title">

        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.SearchResult.Subtitle" parent="TextAppearance.Material.SearchResult.Subtitle">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification" parent="TextAppearance.Material.Notification">

        <item name="fontFamily">@string/config_headlineFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Title" parent="TextAppearance.Material.Notification.Title">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Reply" parent="TextAppearance.Material.Notification.Reply">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget" parent="TextAppearance.Material.Widget">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.Button" parent="TextAppearance.Material.Widget.Button">

    <style name="TextAppearance.DeviceDefault.Widget.Button" parent="TextAppearance.Material.Widget.Button">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

        <item name="textAllCaps">@bool/config_buttonTextAllCaps</item>

        <item name="textAllCaps">@bool/config_buttonTextAllCaps</item>

    </style>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.IconMenu.Item" parent="TextAppearance.Material.Widget.IconMenu.Item"/>

    <style name="TextAppearance.DeviceDefault.Widget.IconMenu.Item" parent="TextAppearance.Material.Widget.IconMenu.Item">

    <style name="TextAppearance.DeviceDefault.Widget.TabWidget" parent="TextAppearance.Material.Widget.TabWidget"/>

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    <style name="TextAppearance.DeviceDefault.Widget.TextView" parent="TextAppearance.Material.Widget.TextView"/>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.TextView.PopupMenu" parent="TextAppearance.Material.Widget.TextView.PopupMenu"/>

    <style name="TextAppearance.DeviceDefault.Widget.TabWidget" parent="TextAppearance.Material.Widget.TabWidget">

    <style name="TextAppearance.DeviceDefault.Widget.DropDownHint" parent="TextAppearance.Material.Widget.DropDownHint"/>

        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>

    <style name="TextAppearance.DeviceDefault.Widget.DropDownItem" parent="TextAppearance.Material.Widget.DropDownItem"/>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.TextView.SpinnerItem" parent="TextAppearance.Material.Widget.TextView.SpinnerItem"/>

    <style name="TextAppearance.DeviceDefault.Widget.TextView" parent="TextAppearance.Material.Widget.TextView">

    <style name="TextAppearance.DeviceDefault.Widget.EditText" parent="TextAppearance.Material.Widget.EditText"/>

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.TextView.PopupMenu" parent="TextAppearance.Material.Widget.TextView.PopupMenu">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.DropDownHint" parent="TextAppearance.Material.Widget.DropDownHint">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.DropDownItem" parent="TextAppearance.Material.Widget.DropDownItem">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.TextView.SpinnerItem" parent="TextAppearance.Material.Widget.TextView.SpinnerItem">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.EditText" parent="TextAppearance.Material.Widget.EditText">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.Button.Borderless.Colored" parent="TextAppearance.DeviceDefault.Widget.Button">

    <style name="TextAppearance.DeviceDefault.Widget.Button.Borderless.Colored" parent="TextAppearance.DeviceDefault.Widget.Button">

        <item name="textColor">@color/btn_colored_borderless_text_material</item>

        <item name="textColor">@color/btn_colored_borderless_text_material</item>

    </style>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.PopupMenu" parent="TextAppearance.Material.Widget.PopupMenu"/>

    <style name="TextAppearance.DeviceDefault.Widget.PopupMenu" parent="TextAppearance.Material.Widget.PopupMenu">

    <style name="TextAppearance.DeviceDefault.Widget.PopupMenu.Large" parent="TextAppearance.Material.Widget.PopupMenu.Large"/>

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    <style name="TextAppearance.DeviceDefault.Widget.PopupMenu.Small" parent="TextAppearance.Material.Widget.PopupMenu.Small"/>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.PopupMenu.Large" parent="TextAppearance.Material.Widget.PopupMenu.Large">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.PopupMenu.Small" parent="TextAppearance.Material.Widget.PopupMenu.Small">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Title" parent="TextAppearance.Material.Widget.ActionBar.Title">

    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Title" parent="TextAppearance.Material.Widget.ActionBar.Title">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

    </style>

    </style>



    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Subtitle" parent="TextAppearance.Material.Widget.ActionBar.Subtitle">

    <!-- Notification Styles -->

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    <style name="TextAppearance.DeviceDefault.Notification" parent="TextAppearance.Material.Notification">

        <item name="fontFamily">@string/config_headlineFontFamily</item>

    </style>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Title" parent="TextAppearance.Material.Notification.Title">

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Title" parent="TextAppearance.Material.Widget.ActionMode.Title">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Subtitle" parent="TextAppearance.Material.Widget.ActionMode.Subtitle">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Reply" parent="TextAppearance.Material.Notification.Reply" />



    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Subtitle" parent="TextAppearance.Material.Widget.ActionBar.Subtitle"/>

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Title" parent="TextAppearance.Material.Widget.ActionMode.Title"/>

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Subtitle" parent="TextAppearance.Material.Widget.ActionMode.Subtitle"/>

    <style name="TextAppearance.DeviceDefault.WindowTitle" parent="TextAppearance.Material.WindowTitle">

    <style name="TextAppearance.DeviceDefault.WindowTitle" parent="TextAppearance.Material.WindowTitle">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

    </style>

    </style>
@@ -279,14 +328,24 @@ easier. 
        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

    </style>

    </style>

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->

    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Title.Inverse" parent="TextAppearance.Material.Widget.ActionBar.Title.Inverse"/>

    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Title.Inverse" parent="TextAppearance.Material.Widget.ActionBar.Title.Inverse">

        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>

    </style>

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->

    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Subtitle.Inverse" parent="TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse"/>

    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Subtitle.Inverse" parent="TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Title.Inverse" parent="TextAppearance.Material.Widget.ActionMode.Title.Inverse"/>

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Title.Inverse" parent="TextAppearance.Material.Widget.ActionMode.Title.Inverse">

        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>

    </style>

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->

    <!-- @deprecated Action bars are now themed using the inheritable android:theme attribute. -->

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Subtitle.Inverse" parent="TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse"/>

    <style name="TextAppearance.DeviceDefault.Widget.ActionMode.Subtitle.Inverse" parent="TextAppearance.Material.Widget.ActionMode.Subtitle.Inverse">

    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Menu" parent="TextAppearance.Material.Widget.ActionBar.Menu"/>

        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.ActionBar.Menu" parent="TextAppearance.Material.Widget.ActionBar.Menu">

        <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget.Toolbar.Title" parent="TextAppearance.DeviceDefault.Widget.ActionBar.Title"/>

    <style name="TextAppearance.DeviceDefault.Widget.Toolbar.Title" parent="TextAppearance.DeviceDefault.Widget.ActionBar.Title"/>





    <!-- Preference Styles -->

    <!-- Preference Styles -->