corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 760267: Using proper naming convention for non-static menu variable. r=mfinkle r=blassey

Browse Source
This commit is contained in:
Sriram Ramasubramanian
2012-06-13 13:28:00 -07:00
parent 3625d895ce
commit f8047cad11
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -498,14 +498,14 @@ abstract public class BrowserApp extends GeckoApp
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) public boolean onCreateOptionsMenu(Menu menu)
{ {
sMenu = menu; mMenu = menu;
// Inform the menu about the action-items bar. // Inform the menu about the action-items bar.
if (menu instanceof GeckoMenu && isTablet()) if (menu instanceof GeckoMenu && isTablet())
((GeckoMenu) menu).setActionItemBarPresenter(mBrowserToolbar); ((GeckoMenu) menu).setActionItemBarPresenter(mBrowserToolbar);
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.gecko_menu, sMenu); inflater.inflate(R.menu.gecko_menu, mMenu);
return true; return true;
} }

33
mobile/android/base/GeckoApp.java
View File

@@ -93,7 +93,7 @@ abstract public class GeckoApp
public static GeckoApp mAppContext; public static GeckoApp mAppContext;
public static boolean mDOMFullScreen = false; public static boolean mDOMFullScreen = false;
protected MenuPanel mMenuPanel; protected MenuPanel mMenuPanel;
public Menu sMenu; protected Menu mMenu;
private static GeckoThread sGeckoThread = null; private static GeckoThread sGeckoThread = null;
public Handler mMainHandler; public Handler mMainHandler;
private GeckoProfile mProfile; private GeckoProfile mProfile;
@@ -410,10 +410,10 @@ abstract public class GeckoApp
} }
private void addAddonMenuItem(final int id, final String label, final String icon) { private void addAddonMenuItem(final int id, final String label, final String icon) {
if (sMenu == null) if (mMenu == null)
return; return;
final MenuItem item = sMenu.add(Menu.NONE, id, Menu.NONE, label); final MenuItem item = mMenu.add(Menu.NONE, id, Menu.NONE, label);
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override @Override
@@ -455,12 +455,12 @@ abstract public class GeckoApp
if (item.getItemId() == id) { if (item.getItemId() == id) {
sAddonMenuItems.remove(item); sAddonMenuItems.remove(item);
if (sMenu == null) if (mMenu == null)
break; break;
MenuItem menuItem = sMenu.findItem(id); MenuItem menuItem = mMenu.findItem(id);
if (menuItem != null) if (menuItem != null)
sMenu.removeItem(id); mMenu.removeItem(id);
break; break;
} }
@@ -469,10 +469,10 @@ abstract public class GeckoApp
@Override @Override
public void invalidateOptionsMenu() { public void invalidateOptionsMenu() {
if (sMenu == null) if (mMenu == null)
return; return;
onPrepareOptionsMenu(sMenu); onPrepareOptionsMenu(mMenu);
if (Build.VERSION.SDK_INT >= 11) if (Build.VERSION.SDK_INT >= 11)
super.invalidateOptionsMenu(); super.invalidateOptionsMenu();
@@ -481,16 +481,19 @@ abstract public class GeckoApp
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) public boolean onCreateOptionsMenu(Menu menu)
{ {
sMenu = menu; mMenu = menu;
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.gecko_menu, sMenu); inflater.inflate(R.menu.gecko_menu, mMenu);
return true; return true;
} }
@Override @Override
public boolean onPrepareOptionsMenu(Menu aMenu) public boolean onPrepareOptionsMenu(Menu aMenu)
{ {
if (aMenu == null)
return false;
if (!sIsGeckoReady) if (!sIsGeckoReady)
aMenu.findItem(R.id.settings).setEnabled(false); aMenu.findItem(R.id.settings).setEnabled(false);
@@ -590,7 +593,7 @@ abstract public class GeckoApp
mMenuPanel = new MenuPanel(mAppContext, null); mMenuPanel = new MenuPanel(mAppContext, null);
} else { } else {
// Prepare the panel everytime before showing the menu. // Prepare the panel everytime before showing the menu.
onPreparePanel(featureId, mMenuPanel, sMenu); onPreparePanel(featureId, mMenuPanel, mMenu);
} }
return mMenuPanel; return mMenuPanel;
@@ -627,9 +630,9 @@ abstract public class GeckoApp
@Override @Override
public boolean onMenuOpened(int featureId, Menu menu) { public boolean onMenuOpened(int featureId, Menu menu) {
if (Build.VERSION.SDK_INT >= 11 && featureId == Window.FEATURE_OPTIONS_PANEL) { if (Build.VERSION.SDK_INT >= 11 && featureId == Window.FEATURE_OPTIONS_PANEL) {
if (sMenu == null) { if (mMenu == null) {
onCreatePanelMenu(featureId, menu); onCreatePanelMenu(featureId, menu);
onPreparePanel(featureId, mMenuPanel, sMenu); onPreparePanel(featureId, mMenuPanel, mMenu);
} }
// Scroll custom menu to the top // Scroll custom menu to the top
@@ -1029,7 +1032,7 @@ abstract public class GeckoApp
handleDoorHangerRemove(message); handleDoorHangerRemove(message);
} else if (event.equals("Gecko:Ready")) { } else if (event.equals("Gecko:Ready")) {
sIsGeckoReady = true; sIsGeckoReady = true;
final Menu menu = sMenu; final Menu menu = mMenu;
mMainHandler.post(new Runnable() { mMainHandler.post(new Runnable() {
public void run() { public void run() {
if (menu != null) if (menu != null)
@@ -1089,7 +1092,7 @@ abstract public class GeckoApp
} else if (event.equals("CharEncoding:State")) { } else if (event.equals("CharEncoding:State")) {
final boolean visible = message.getString("visible").equals("true"); final boolean visible = message.getString("visible").equals("true");
GeckoPreferences.setCharEncodingState(visible); GeckoPreferences.setCharEncodingState(visible);
final Menu menu = sMenu; final Menu menu = mMenu;
mMainHandler.post(new Runnable() { mMainHandler.post(new Runnable() {
public void run() { public void run() {
if (menu != null) if (menu != null)