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

Commit 5c7ab895 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update font config name."

parents e012e7a3 1db9fd90

core/res/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -3256,8 +3256,8 @@ 
    <dimen name="config_buttonCornerRadius">@dimen/control_corner_material</dimen>

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

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

    <!-- Name of the font family used for system buttons -->

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

    <!-- 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 translatable="false" name="config_batterySaverDeviceSpecificConfig"></string>

core/res/res/values/styles_device_defaults.xml

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ easier. 
    <style name="TextAppearance.DeviceDefault.SearchResult.Subtitle" parent="TextAppearance.Material.SearchResult.Subtitle"/>

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

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

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

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

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

    </style>

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