commit 75c00531ecd6c10bcb12c06f19a0d51467ddb525
author Adam Powell <adamp@google.com> Wed Oct 12 12:26:42 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 12 12:26:42 2011 -0700
tree e7028bb09d48f002cb99ab9fec1b878a5952a516
parent 678f8ccb3e6d84fa4154af435c919a39523619bd
parent f2894659e8df625783afcd3fa17462ab23d29145

am f2894659: Fix bug 5449931 - Wrong theme for icon menus

* commit 'f2894659e8df625783afcd3fa17462ab23d29145':
  Fix bug 5449931 - Wrong theme for icon menus

core/java/com/android/internal/view/menu/IconMenuPresenter.java

diff --git a/core/java/com/android/internal/view/menu/IconMenuPresenter.java b/core/java/com/android/internal/view/menu/IconMenuPresenter.java
index 3b1decd..2439b5d 100644
--- a/core/java/com/android/internal/view/menu/IconMenuPresenter.java
+++ b/core/java/com/android/internal/view/menu/IconMenuPresenter.java
@@ -22,7 +22,6 @@
 import android.os.Parcelable;
 import android.util.SparseArray;
 import android.view.ContextThemeWrapper;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,15 +43,14 @@
     private static final String OPEN_SUBMENU_KEY = "android:menu:icon:submenu";
 
     public IconMenuPresenter(Context context) {
-        super(context, com.android.internal.R.layout.icon_menu_layout,
+        super(new ContextThemeWrapper(context, com.android.internal.R.style.Theme_IconMenu),
+                com.android.internal.R.layout.icon_menu_layout,
                 com.android.internal.R.layout.icon_menu_item_layout);
     }
 
     @Override
     public void initForMenu(Context context, MenuBuilder menu) {
-        mContext = new ContextThemeWrapper(context, com.android.internal.R.style.Theme_IconMenu);
-        mInflater = LayoutInflater.from(mContext);
-        mMenu = menu;
+        super.initForMenu(context, menu);
         mMaxItems = -1;
     }