From f2894659e8df625783afcd3fa17462ab23d29145 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Wed, 12 Oct 2011 12:13:45 -0700
Subject: [PATCH] Fix bug 5449931 - Wrong theme for icon menus

IconMenuPresenter should always use its own theme for the system
inflater.

Change-Id: Iacadce37d62a60cdf6220d82f1178098ed92d51e
---
 .../com/android/internal/view/menu/IconMenuPresenter.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/java/com/android/internal/view/menu/IconMenuPresenter.java b/core/java/com/android/internal/view/menu/IconMenuPresenter.java
index 3b1decd9a555d..2439b5df3acc5 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.Bundle;
 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 @@ public class IconMenuPresenter extends BaseMenuPresenter {
     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;
     }