diff options
| author | Adam Powell <adamp@google.com> | 2011-01-27 17:20:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-27 17:20:32 -0800 |
| commit | 599814f16c6f25495cf05146e2760bf0ca46455d (patch) | |
| tree | 03c39ce659fb0707dde56acf2591ffffb8e865ac /core/java/android/view | |
| parent | d3939c09dbfdff453855b9ff96025d42b71d9290 (diff) | |
| parent | f95e8c5bb24b3e2ea217fb140077526bde5d6dcc (diff) | |
| download | frameworks_base-599814f16c6f25495cf05146e2760bf0ca46455d.zip frameworks_base-599814f16c6f25495cf05146e2760bf0ca46455d.tar.gz frameworks_base-599814f16c6f25495cf05146e2760bf0ca46455d.tar.bz2 | |
am f95e8c5b: Merge "Fix bug 3400213 - MenuItem ignores String spannable colors" into honeycomb
* commit 'f95e8c5bb24b3e2ea217fb140077526bde5d6dcc':
Fix bug 3400213 - MenuItem ignores String spannable colors
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/MenuInflater.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/view/MenuInflater.java b/core/java/android/view/MenuInflater.java index ab515c9..372ac15 100644 --- a/core/java/android/view/MenuInflater.java +++ b/core/java/android/view/MenuInflater.java @@ -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)); |