Bug 886528: Move onCreatePanelView to GeckoApp. [r=mfinkle]

--HG--
extra : rebase_source : 4383294087f67382e8f96e9351f41ce6a61b7cf8
This commit is contained in:
Sriram Ramasubramanian 2013-06-25 14:26:01 -07:00
parent 81b1972949
commit d5e1d05f01
2 changed files with 4 additions and 5 deletions

View File

@ -416,11 +416,6 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
});
}
if (Build.VERSION.SDK_INT >= 11) {
// Create the panel and inflate the custom menu.
mActivity.onCreatePanelMenu(Window.FEATURE_OPTIONS_PANEL, null);
}
mFocusOrder = Arrays.asList(mBack, mForward, mLayout, mReader, mSiteSecurity, mStop, mTabs);
}

View File

@ -1345,6 +1345,10 @@ abstract public class GeckoApp
private void initialize() {
mInitialized = true;
if (Build.VERSION.SDK_INT >= 11) {
// Create the panel and inflate the custom menu.
onCreatePanelMenu(Window.FEATURE_OPTIONS_PANEL, null);
}
invalidateOptionsMenu();
Intent intent = getIntent();