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

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

Browse Source 
* commit 'f95e8c5bb24b3e2ea217fb140077526bde5d6dcc':
  Fix bug 3400213 - MenuItem ignores String spannable colors
This commit is contained in:
Adam Powell
2011-01-27 17:20:32 -08:00
committed by Android Git Automerger
parent d3939c09db f95e8c5bb2
commit 599814f16c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/MenuInflater.java
View File

@@ -228,8 +228,8 @@ public class MenuInflater {
private boolean itemAdded;
private int itemId;
private int itemCategoryOrder;
private String itemTitle;
private String itemTitleCondensed;
private CharSequence itemTitle;
private CharSequence itemTitleCondensed;
private int itemIconResId;
private char itemAlphabeticShortcut;
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 order = a.getInt(com.android.internal.R.styleable.MenuItem_orderInCategory, groupOrder);
itemCategoryOrder = (category & Menu.CATEGORY_MASK) | (order & Menu.USER_MASK);
itemTitle = a.getString(com.android.internal.R.styleable.MenuItem_title);
itemTitleCondensed = a.getString(com.android.internal.R.styleable.MenuItem_titleCondensed);
itemTitle = a.getText(com.android.internal.R.styleable.MenuItem_title);
itemTitleCondensed = a.getText(com.android.internal.R.styleable.MenuItem_titleCondensed);
itemIconResId = a.getResourceId(com.android.internal.R.styleable.MenuItem_icon, 0);
itemAlphabeticShortcut =
getShortcut(a.getString(com.android.internal.R.styleable.MenuItem_alphabeticShortcut));