diff options
| author | Adam Powell <adamp@google.com> | 2014-08-19 22:14:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 02:43:23 +0000 |
| commit | 75d6bc1aee918da1512b41639d3f7d17ebdc9cb6 (patch) | |
| tree | 65c3e9e0722f8094a1ec7379aff74ed4a96f4f4c /api | |
| parent | 9e4329ea0b8b725ca5bcec74032b765d01deaa80 (diff) | |
| parent | 2c818ca0a529f872d8f8a42f4c922bbdf9606ebc (diff) | |
| download | frameworks_base-75d6bc1aee918da1512b41639d3f7d17ebdc9cb6.zip frameworks_base-75d6bc1aee918da1512b41639d3f7d17ebdc9cb6.tar.gz frameworks_base-75d6bc1aee918da1512b41639d3f7d17ebdc9cb6.tar.bz2 | |
Merge "Make Toolbars (and Toolbar-based ActionBars) have constant text size" into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ab134f3..e3f641e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2047,6 +2047,8 @@ package android { field public static final int TextAppearance_Material_Widget_TextView = 16974381; // 0x103022d field public static final int TextAppearance_Material_Widget_TextView_PopupMenu = 16974382; // 0x103022e field public static final int TextAppearance_Material_Widget_TextView_SpinnerItem = 16974383; // 0x103022f + field public static final int TextAppearance_Material_Widget_Toolbar_Subtitle = 16974569; // 0x10302e9 + field public static final int TextAppearance_Material_Widget_Toolbar_Title = 16974568; // 0x10302e8 field public static final int TextAppearance_Material_WindowTitle = 16974361; // 0x1030219 field public static final int TextAppearance_Medium = 16973892; // 0x1030044 field public static final int TextAppearance_Medium_Inverse = 16973893; // 0x1030045 |