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

Commit 32ce9f76 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Add hooks to configure system button text styling. 

Adds configuration values to change the styling of buttons on system
surfaces. Specifically, adds config_fontFamilyButton and
config_buttonTextAllCaps to control the default font and whether text
is all caps.

Additionally, adds plumbing so that these configs are utilized by
Theme.DeviceDefault (and descendent) themes. Some styles are added/updated
for this support.

Bug: 64122537
Bug: 69314526
Test: ag/3228846
Change-Id: I08406633bd744c6f58d5144d035aa27bf9c175df
parent 178dfc66

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2313,7 +2313,9 @@ package android { 
    field public static final int Widget_DeviceDefault_AutoCompleteTextView = 16974151; // 0x1030147

    field public static final int Widget_DeviceDefault_Button = 16974145; // 0x1030141

    field public static final int Widget_DeviceDefault_Button_Borderless = 16974188; // 0x103016c

    field public static final int Widget_DeviceDefault_Button_Borderless_Colored = 16974561; // 0x10302e1

    field public static final int Widget_DeviceDefault_Button_Borderless_Small = 16974149; // 0x1030145

    field public static final int Widget_DeviceDefault_Button_Colored = 16974560; // 0x10302e0

    field public static final int Widget_DeviceDefault_Button_Inset = 16974147; // 0x1030143

    field public static final int Widget_DeviceDefault_Button_Small = 16974146; // 0x1030142

    field public static final int Widget_DeviceDefault_Button_Toggle = 16974148; // 0x1030144

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -3174,6 +3174,10 @@ 


    <!-- Corner radius of system dialogs -->

    <dimen name="config_dialogCornerRadius">2dp</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>



    <string translatable="false" name="config_batterySaverDeviceSpecificConfig"></string>

</resources>

core/res/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ 
    <dimen name="alert_dialog_round_padding">27dip</dimen>

    <!-- Dialog title height -->

    <dimen name="alert_dialog_title_height">64dip</dimen>

    <!-- Dialog button bar width -->

    <dimen name="alert_dialog_button_bar_width">64dp</dimen>

    <!-- Dialog button bar height -->

    <dimen name="alert_dialog_button_bar_height">48dip</dimen>

    <!-- Leanback dialog vertical margin -->

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -2855,6 +2855,8 @@ 
    </public-group>



    <public-group type="style" first-id="0x010302e0">

      <public name="Widget.DeviceDefault.Button.Colored" />

      <public name="Widget.DeviceDefault.Button.Borderless.Colored" />

    </public-group>



    <public-group type="id" first-id="0x01020044">

core/res/res/values/styles_device_defaults.xml

+20 −1
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ easier. 
    <style name="Widget.DeviceDefault.Button.Small" parent="Widget.Material.Button.Small"/>

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

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

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

        <item name="textAppearance">?attr/textAppearanceButton</item>

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

    </style>

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

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

    <style name="Widget.DeviceDefault.AutoCompleteTextView" parent="Widget.Material.AutoCompleteTextView"/>
@@ -77,6 +81,15 @@ easier. 
    <style name="Widget.DeviceDefault.ActionButton.CloseMode" parent="Widget.Material.ActionButton.CloseMode"/>

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

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

    <!-- Colored borderless ink button -->

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

        <item name="textAppearance">@style/TextAppearance.DeviceDefault.Widget.Button.Borderless.Colored</item>

    </style>

    <!-- Alert dialog button bar button -->

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

        <item name="minWidth">@dimen/alert_dialog_button_bar_width</item>

        <item name="minHeight">@dimen/alert_dialog_button_bar_height</item>

    </style>

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

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

    <style name="Widget.DeviceDefault.DatePicker" parent="Widget.Material.DatePicker"/>
@@ -211,7 +224,10 @@ easier. 
    <style name="TextAppearance.DeviceDefault.SearchResult.Title" parent="TextAppearance.Material.SearchResult.Title"/>

    <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"/>

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

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

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

    </style>

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

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

    <style name="TextAppearance.DeviceDefault.Widget.TextView" parent="TextAppearance.Material.Widget.TextView"/>
@@ -220,6 +236,9 @@ easier. 
    <style name="TextAppearance.DeviceDefault.Widget.DropDownItem" parent="TextAppearance.Material.Widget.DropDownItem"/>

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

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

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

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

    </style>

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

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

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