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

Commit 16323615 authored by Chris Banes's avatar Chris Banes Committed by Android (Google) Code Review
Browse files

Merge "Fix text appearances not working in colored button styles" into nyc-dev

parents 15818e11 ec39b57e

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2024,6 +2024,8 @@ package android { 
    field public static final int TextAppearance_Material_Widget_ActionMode_Title = 16974355; // 0x1030213

    field public static final int TextAppearance_Material_Widget_ActionMode_Title_Inverse = 16974356; // 0x1030214

    field public static final int TextAppearance_Material_Widget_Button = 16974357; // 0x1030215

    field public static final int TextAppearance_Material_Widget_Button_Borderless_Colored = 16974559; // 0x10302df

    field public static final int TextAppearance_Material_Widget_Button_Colored = 16974558; // 0x10302de

    field public static final int TextAppearance_Material_Widget_Button_Inverse = 16974548; // 0x10302d4

    field public static final int TextAppearance_Material_Widget_DropDownHint = 16974358; // 0x1030216

    field public static final int TextAppearance_Material_Widget_DropDownItem = 16974359; // 0x1030217

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2136,6 +2136,8 @@ package android { 
    field public static final int TextAppearance_Material_Widget_ActionMode_Title = 16974355; // 0x1030213

    field public static final int TextAppearance_Material_Widget_ActionMode_Title_Inverse = 16974356; // 0x1030214

    field public static final int TextAppearance_Material_Widget_Button = 16974357; // 0x1030215

    field public static final int TextAppearance_Material_Widget_Button_Borderless_Colored = 16974559; // 0x10302df

    field public static final int TextAppearance_Material_Widget_Button_Colored = 16974558; // 0x10302de

    field public static final int TextAppearance_Material_Widget_Button_Inverse = 16974548; // 0x10302d4

    field public static final int TextAppearance_Material_Widget_DropDownHint = 16974358; // 0x1030216

    field public static final int TextAppearance_Material_Widget_DropDownItem = 16974359; // 0x1030217

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2024,6 +2024,8 @@ package android { 
    field public static final int TextAppearance_Material_Widget_ActionMode_Title = 16974355; // 0x1030213

    field public static final int TextAppearance_Material_Widget_ActionMode_Title_Inverse = 16974356; // 0x1030214

    field public static final int TextAppearance_Material_Widget_Button = 16974357; // 0x1030215

    field public static final int TextAppearance_Material_Widget_Button_Borderless_Colored = 16974559; // 0x10302df

    field public static final int TextAppearance_Material_Widget_Button_Colored = 16974558; // 0x10302de

    field public static final int TextAppearance_Material_Widget_Button_Inverse = 16974548; // 0x10302d4

    field public static final int TextAppearance_Material_Widget_DropDownHint = 16974358; // 0x1030216

    field public static final int TextAppearance_Material_Widget_DropDownItem = 16974359; // 0x1030217

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -2726,6 +2726,8 @@ 
    <public type="style" name="Widget.Material.Light.CompoundButton.Switch" />

    <public type="style" name="Widget.Material.NumberPicker" />

    <public type="style" name="Widget.Material.Light.NumberPicker" />

    <public type="style" name="TextAppearance.Material.Widget.Button.Colored" />

    <public type="style" name="TextAppearance.Material.Widget.Button.Borderless.Colored" />



    <public type="id" name="accessibilityActionSetProgress" />

    <public type="id" name="icon_frame" />

core/res/res/values/styles_material.xml

+10 −3
Original line number Diff line number Diff line
@@ -298,6 +298,14 @@ please see styles_device_defaults.xml. 
        <item name="textColor">?attr/textColorPrimaryInverse</item>

    </style>



    <style name="TextAppearance.Material.Widget.Button.Colored">

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

    </style>



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

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

    </style>



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

        <item name="textColor">?attr/textColorPrimaryInverse</item>

        <item name="textColorHint">?attr/textColorHintInverse</item>
@@ -485,8 +493,7 @@ please see styles_device_defaults.xml. 
    <!-- Colored bordered ink button -->

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

        <item name="background">@drawable/btn_colored_material</item>

        <item name="textAppearance">@style/TextAppearance.Material.Widget.Button.Inverse</item>

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

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

    </style>



    <!-- Small bordered ink button -->
@@ -503,7 +510,7 @@ please see styles_device_defaults.xml. 


    <!-- Colored borderless ink button -->

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

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

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

    </style>



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