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

Commit e0946eb2 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5307916 - legacy menu theming"

parents 03c2a005 bc835039

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

+5 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick 
    public ListMenuPresenter(Context context, int itemLayoutRes) {

        this(itemLayoutRes, 0);

        mContext = context;

        mInflater = LayoutInflater.from(mContext);

    }



    /**
@@ -78,10 +79,13 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick 
    public void initForMenu(Context context, MenuBuilder menu) {

        if (mThemeRes != 0) {

            mContext = new ContextThemeWrapper(context, mThemeRes);

            mInflater = LayoutInflater.from(mContext);

        } else if (mContext != null) {

            mContext = context;

        }

            if (mInflater == null) {

                mInflater = LayoutInflater.from(mContext);

            }

        }

        mMenu = menu;

    }

core/res/res/layout/list_menu_item_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginLeft="16dip"

        android:layout_marginRight="16dip"

        android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"

        android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"

        android:duplicateParentState="true">

        

        <TextView

core/res/res/values/themes.xml

+5 −0
Original line number Diff line number Diff line
@@ -616,6 +616,9 @@ please see themes_device_defaults.xml. 
        <item name="textAppearanceLargeInverse">@android:style/TextAppearance.Large.Inverse</item>

        <item name="textAppearanceMediumInverse">@android:style/TextAppearance.Medium.Inverse</item>

        <item name="textAppearanceSmallInverse">@android:style/TextAppearance.Small.Inverse</item>



        <item name="listPreferredItemPaddingLeft">10dip</item>

        <item name="listPreferredItemPaddingRight">10dip</item>

    </style>



    <!-- Variation of Theme.Dialog that does not include a frame (or background).
@@ -640,6 +643,8 @@ please see themes_device_defaults.xml. 
        <item name="windowTitleStyle">@android:style/DialogWindowTitle</item>

        <item name="windowContentOverlay">@null</item>

        <item name="itemTextAppearance">@android:style/TextAppearance.Large.Inverse</item>

        <item name="textAppearanceListItem">@android:style/TextAppearance.Large.Inverse</item>

        <item name="textAppearanceListItemSmall">@android:style/TextAppearance.Large.Inverse</item>

    </style>

    

    <!-- Default dark theme for panel windows.  This removes all extraneous