Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f2894659e8df625783afcd3fa17462ab23d29145':
  Fix bug 5449931 - Wrong theme for icon menus
This commit is contained in:
Adam Powell
2011-10-12 12:26:42 -07:00
committed by Android Git Automerger
parent 678f8ccb3e f2894659e8
commit 75c00531ec
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/view/menu/IconMenuPresenter.java
View File

@@ -22,7 +22,6 @@ import android.os.Bundle;
import android.os.Parcelable; import android.os.Parcelable;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.ContextThemeWrapper; import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -44,15 +43,14 @@ public class IconMenuPresenter extends BaseMenuPresenter {
private static final String OPEN_SUBMENU_KEY = "android:menu:icon:submenu"; private static final String OPEN_SUBMENU_KEY = "android:menu:icon:submenu";
public IconMenuPresenter(Context context) { 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); com.android.internal.R.layout.icon_menu_item_layout);
} }
@Override @Override
public void initForMenu(Context context, MenuBuilder menu) { public void initForMenu(Context context, MenuBuilder menu) {
mContext = new ContextThemeWrapper(context, com.android.internal.R.style.Theme_IconMenu); super.initForMenu(context, menu);
mInflater = LayoutInflater.from(mContext);
mMenu = menu;
mMaxItems = -1; mMaxItems = -1;
} }