diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/styles_material.xml | 13 |
5 files changed, 18 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 70ea1c577134..67d9b4a08a1a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/api/system-current.txt b/api/system-current.txt index a6f612d195bf..2d9d466dd75d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/api/test-current.txt b/api/test-current.txt index 37bc7afb69ef..9e5b9917ff6f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 8e9e97869d77..fee2469083e1 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -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" /> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index 3ed8daae9dae..c0060fda8ab8 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -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 --> |