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

Commit 599814f1 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am f95e8c5b: Merge "Fix bug 3400213 - MenuItem ignores String spannable colors" into honeycomb 

* commit 'f95e8c5b':
  Fix bug 3400213 - MenuItem ignores String spannable colors
parents d3939c09 f95e8c5b

core/java/android/view/MenuInflater.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -228,8 +228,8 @@ public class MenuInflater { 
        private boolean itemAdded;

        private boolean itemAdded;

        private int itemId;

        private int itemId;

        private int itemCategoryOrder;

        private int itemCategoryOrder;

        private String itemTitle;

        private CharSequence itemTitle;

        private String itemTitleCondensed;

        private CharSequence itemTitleCondensed;

        private int itemIconResId;

        private int itemIconResId;

        private char itemAlphabeticShortcut;

        private char itemAlphabeticShortcut;

        private char itemNumericShortcut;

        private char itemNumericShortcut;
@@ -311,8 +311,8 @@ public class MenuInflater { 
            final int category = a.getInt(com.android.internal.R.styleable.MenuItem_menuCategory, groupCategory);

            final int category = a.getInt(com.android.internal.R.styleable.MenuItem_menuCategory, groupCategory);

            final int order = a.getInt(com.android.internal.R.styleable.MenuItem_orderInCategory, groupOrder);

            final int order = a.getInt(com.android.internal.R.styleable.MenuItem_orderInCategory, groupOrder);

            itemCategoryOrder = (category & Menu.CATEGORY_MASK) | (order & Menu.USER_MASK);

            itemCategoryOrder = (category & Menu.CATEGORY_MASK) | (order & Menu.USER_MASK);

            itemTitle = a.getString(com.android.internal.R.styleable.MenuItem_title);

            itemTitle = a.getText(com.android.internal.R.styleable.MenuItem_title);

            itemTitleCondensed = a.getString(com.android.internal.R.styleable.MenuItem_titleCondensed);

            itemTitleCondensed = a.getText(com.android.internal.R.styleable.MenuItem_titleCondensed);

            itemIconResId = a.getResourceId(com.android.internal.R.styleable.MenuItem_icon, 0);

            itemIconResId = a.getResourceId(com.android.internal.R.styleable.MenuItem_icon, 0);

            itemAlphabeticShortcut =

            itemAlphabeticShortcut =

                    getShortcut(a.getString(com.android.internal.R.styleable.MenuItem_alphabeticShortcut));

                    getShortcut(a.getString(com.android.internal.R.styleable.MenuItem_alphabeticShortcut));