diff options
| author | Alan Viverette <alanv@google.com> | 2014-07-22 20:07:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-22 16:29:55 +0000 |
| commit | cd73d1adda3bc16a46f89f4331962076cd7f87f3 (patch) | |
| tree | 59c1df16409af32b3f083d0fb75668d1d9d2db69 /api | |
| parent | fcd8b20e09ca066da6d2564935d8dbfff2777547 (diff) | |
| parent | 22a117d1b60869ed36d125796396f190b4b002fb (diff) | |
| download | frameworks_base-cd73d1adda3bc16a46f89f4331962076cd7f87f3.zip frameworks_base-cd73d1adda3bc16a46f89f4331962076cd7f87f3.tar.gz frameworks_base-cd73d1adda3bc16a46f89f4331962076cd7f87f3.tar.bz2 | |
Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 76616c3..0ca5639 100644 --- a/api/current.txt +++ b/api/current.txt @@ -948,6 +948,7 @@ package android { field public static final int popupKeyboard = 16843331; // 0x1010243 field public static final int popupLayout = 16843323; // 0x101023b field public static final int popupMenuStyle = 16843520; // 0x1010300 + field public static final int popupTheme = 16843951; // 0x10104af field public static final int popupWindowStyle = 16842870; // 0x1010076 field public static final int port = 16842793; // 0x1010029 field public static final int positiveButtonText = 16843253; // 0x10101f5 |