Bug 1195517 - Remove unused ic_menu_addons_filler. r=liuche

This also removes code to set an icon from an addon, which is unused because,
afaik, addons' icons are also hidden. iirc, there was a bug open on whether we
want addons to be able to show icons (e.g. could be used to show status), but
we can reimplement this if that bug is ever decided.

I was not able to test this with an addon that sets an icon but I did test that
the application did not crash with no addons installed.
This commit is contained in:
Michael Comella 2015-08-17 15:29:52 -07:00
parent 523b9b39d1
commit 698e4dbae7
3 changed files with 0 additions and 21 deletions

View File

@ -2952,27 +2952,6 @@ public class BrowserApp extends GeckoApp
}
});
if (info.icon == null) {
item.setIcon(R.drawable.ic_menu_addons_filler);
} else {
final int id = info.id;
BitmapUtils.getDrawable(this, info.icon, new BitmapUtils.BitmapLoader() {
@Override
public void onBitmapFound(Drawable d) {
// TODO: why do we re-find the item?
final MenuItem item = destination.findItem(id);
if (item == null) {
return;
}
if (d == null) {
item.setIcon(R.drawable.ic_menu_addons_filler);
return;
}
item.setIcon(d);
}
});
}
item.setCheckable(info.checkable);
item.setChecked(info.checked);
item.setEnabled(info.enabled);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 933 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB