Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix text appearances not working in colored button styles" into nyc-dev am: 163236156f

Browse Source 
am: def151052c

* commit 'def151052c2e48a3f0e8de8dbab65db4e953abeb':
  Fix text appearances not working in colored button styles

Change-Id: I3f47630eaf5bc2893b845ad141087d2a2a7011f5
This commit is contained in:
Chris Banes
2016-05-25 18:20:27 +00:00
committed by android-build-merger
parent b1f52d0b89 def151052c
commit f34dec952e
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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

2
api/system-current.txt
View File

@@ -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

2
api/test-current.txt
View File

@@ -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