diff options
| author | Adam Powell <adamp@google.com> | 2012-03-19 15:35:46 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2012-03-19 15:35:46 -0700 |
| commit | c4852a37186260bf688dc94a77a4ebd2a8290a02 (patch) | |
| tree | 1e8ae87f477d3e7537341b45920d55781f38cecd /core/java/com | |
| parent | f6b8f7b34f5fe94cd1d8753ec356b967293f1f9c (diff) | |
| download | frameworks_base-c4852a37186260bf688dc94a77a4ebd2a8290a02.zip frameworks_base-c4852a37186260bf688dc94a77a4ebd2a8290a02.tar.gz frameworks_base-c4852a37186260bf688dc94a77a4ebd2a8290a02.tar.bz2 | |
Fix a bug where MenuItems would not return consistent results for
item icons initialized from a drawable resource id.
Change-Id: Ieb5245b8fe0e11b2eb788143859da1c0b3657b9f
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/view/menu/MenuItemImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java index 04147ab..2564921 100644 --- a/core/java/com/android/internal/view/menu/MenuItemImpl.java +++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java @@ -382,7 +382,10 @@ public final class MenuItemImpl implements MenuItem { } if (mIconResId != NO_ICON) { - return mMenu.getResources().getDrawable(mIconResId); + Drawable icon = mMenu.getResources().getDrawable(mIconResId); + mIconResId = NO_ICON; + mIconDrawable = icon; + return icon; } return null; |