summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/create
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-05-13 02:00:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-13 02:00:17 +0000
commit6f6989f3532b0022c8ebed59dbd9e4fdc5362978 (patch)
tree60455c773b12d2bd4c68ea9eb3a5bb7d54ec0e25 /tools/layoutlib/create
parent6c600df67388706d24486022fa73ed8786119faf (diff)
parent80f2914b4b12340ff590882125789144d4f00ce0 (diff)
downloadframeworks_base-6f6989f3532b0022c8ebed59dbd9e4fdc5362978.zip
frameworks_base-6f6989f3532b0022c8ebed59dbd9e4fdc5362978.tar.gz
frameworks_base-6f6989f3532b0022c8ebed59dbd9e4fdc5362978.tar.bz2
am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]
* commit '80f2914b4b12340ff590882125789144d4f00ce0': Add view cookies for action bar menus. [DO NOT MERGE]
Diffstat (limited to 'tools/layoutlib/create')
-rw-r--r--tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
index d424352..e9612a3 100644
--- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
@@ -142,6 +142,8 @@ public final class CreateInfo implements ICreateInfo {
"android.view.ViewRootImpl#isInTouchMode",
"android.view.WindowManagerGlobal#getWindowManagerService",
"android.view.inputmethod.InputMethodManager#getInstance",
+ "android.view.MenuInflater#registerMenu",
+ "com.android.internal.view.menu.MenuBuilder#createNewMenuItem",
"com.android.internal.util.XmlUtils#convertValueToInt",
"com.android.internal.textservice.ITextServicesManager$Stub#asInterface",
};