Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0060f8bf authored by Adam Powell's avatar Adam Powell Committed by The Android Automerger
Browse files

Fix bug 5449931 - Wrong theme for icon menus 

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

Change-Id: Iacadce37d62a60cdf6220d82f1178098ed92d51e
parent 34877877

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }