Bug 890671: Addon icon is missing when the menu item adds a submenu. [r=mfinkle]

--HG--
extra : rebase_source : 9d27cd4ffd03c59c27d9eb9830f897efa09800c6
This commit is contained in:
Sriram Ramasubramanian 2013-07-09 00:19:46 -07:00
parent 96c08c069b
commit 821816087b

View File

@ -1434,7 +1434,7 @@ abstract public class BrowserApp extends GeckoApp
} }
} }
final MenuItem item = menu.add(Menu.NONE, info.id, Menu.NONE, info.label); MenuItem item = menu.add(Menu.NONE, info.id, Menu.NONE, info.label);
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
@ -1445,9 +1445,11 @@ abstract public class BrowserApp extends GeckoApp
}); });
if (info.icon != null) { if (info.icon != null) {
final int id = info.id;
BitmapUtils.getDrawable(this, info.icon, new BitmapUtils.BitmapLoader() { BitmapUtils.getDrawable(this, info.icon, new BitmapUtils.BitmapLoader() {
@Override @Override
public void onBitmapFound(Drawable d) { public void onBitmapFound(Drawable d) {
MenuItem item = mMenu.findItem(id);
if (d == null) { if (d == null) {
item.setIcon(R.drawable.ic_menu_addons_filler); item.setIcon(R.drawable.ic_menu_addons_filler);
return; return;