summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/NavScreen.java
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-04-20 16:45:33 -0700
committerMichael Kolb <kolby@google.com>2011-04-20 16:59:41 -0700
commitfedb492d1ac1068e17028b6d4083d1a6b0578287 (patch)
tree0b8c336e13052d9e32eb5756dd8ef4975841abdd /src/com/android/browser/NavScreen.java
parentf205560dacc8a85f0443ca1949a68962404321e8 (diff)
downloadandroid_packages_apps_Gello-fedb492d1ac1068e17028b6d4083d1a6b0578287.tar.gz
android_packages_apps_Gello-fedb492d1ac1068e17028b6d4083d1a6b0578287.tar.bz2
android_packages_apps_Gello-fedb492d1ac1068e17028b6d4083d1a6b0578287.zip
remove menu inflation hack
Change-Id: I481f35120cb753f3c2f8cce815cff2ab4597e16b
Diffstat (limited to 'src/com/android/browser/NavScreen.java')
-rw-r--r--src/com/android/browser/NavScreen.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index 8b897df5..a1fa639b 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -86,7 +86,10 @@ public class NavScreen extends LinearLayout implements OnClickListener {
requestLayout();
}
- protected void showMenu(Menu menu) {
+ protected void showMenu() {
+ Menu menu = mUi.getMenu();
+ menu.setGroupVisible(R.id.NAV_MENU, false);
+
MenuAdapter menuAdapter = new MenuAdapter(mContext);
menuAdapter.setMenu(menu);
ListPopupWindow popup = new ListPopupWindow(mContext);
@@ -207,7 +210,7 @@ public class NavScreen extends LinearLayout implements OnClickListener {
mUi.hideNavScreen(true);
mUiController.openTabToHomePage();
} else if (mMore == v) {
- mActivity.openOptionsMenu();
+ showMenu();
} else if (mNewIncognito == v) {
mUi.hideNavScreen(true);
mUiController.openIncognitoTab();