Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-10 22:09:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 788520: Menu item missing in Android 2.x. [r=mfinkle]

Browse Source 
--HG--
extra : rebase_source : 38c1b9a2f092687f849a4bb39f8784ab488d9fce
This commit is contained in:
Sriram Ramasubramanian 2012-09-27 11:22:08 -07:00
parent 8d64bf3e60
commit 56b69b5026
1 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
mobile/android/base/BrowserApp.java
View File

@ -54,7 +54,19 @@ abstract public class BrowserApp extends GeckoApp
private boolean mAboutHomeShowing;
private static final int ADDON_MENU_OFFSET = 1000;
static Vector<MenuItem> sAddonMenuItems = new Vector<MenuItem>();
private class MenuItemInfo {
int id;
String label;
String icon;
public MenuItemInfo(int id, String label, String icon) {
this.id = id;
this.label = label;
this.icon = icon;
}
}
private Vector<MenuItemInfo> mAddonMenuItemsCache;
private PropertyAnimator mMainLayoutAnimator;
@ -637,8 +649,13 @@ abstract public class BrowserApp extends GeckoApp
}
private void addAddonMenuItem(final int id, final String label, final String icon) {
if (mMenu == null)
if (mMenu == null) {
if (mAddonMenuItemsCache == null)
mAddonMenuItemsCache = new Vector<MenuItemInfo>();
mAddonMenuItemsCache.add(new MenuItemInfo(id, label, icon));
return;
}
final MenuItem item = mMenu.add(Menu.NONE, id, Menu.NONE, label);
@ -677,24 +694,25 @@ abstract public class BrowserApp extends GeckoApp
});
}
}
sAddonMenuItems.add(item);
}
private void removeAddonMenuItem(int id) {
for (MenuItem item : sAddonMenuItems) {
if (item.getItemId() == id) {
sAddonMenuItems.remove(item);
if (mMenu == null)
break;
MenuItem menuItem = mMenu.findItem(id);
if (menuItem != null)
mMenu.removeItem(id);
break;
// Remove add-on menu item from cache, if available.
if (mAddonMenuItemsCache != null && !mAddonMenuItemsCache.isEmpty()) {
for (MenuItemInfo item : mAddonMenuItemsCache) {
if (item.id == id) {
mAddonMenuItemsCache.remove(item);
break;
}
}
}
if (mMenu == null)
return;
MenuItem menuItem = mMenu.findItem(id);
if (menuItem != null)
mMenu.removeItem(id);
}
@Override
@ -707,6 +725,16 @@ abstract public class BrowserApp extends GeckoApp
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.browser_app_menu, mMenu);
// Add add-on menu items if any.
if (mAddonMenuItemsCache != null && !mAddonMenuItemsCache.isEmpty()) {
for (MenuItemInfo item : mAddonMenuItemsCache) {
addAddonMenuItem(item.id, item.label, item.icon);
}
mAddonMenuItemsCache.clear();
}
return true;
}