From 3ca12750f9b6231b00a1856dcb25c2d2e07e8784 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Wed, 20 Jul 2011 13:52:25 -0700
Subject: use system menu

    On phones with hardware menu key, use the framework's
    menu
    Also fixes:
    Bug: 5051899
    remove overflow button from bar if menu key is present
    Nav options are not visible on tab switcher

Change-Id: I5b55934a392a76f9d9ef16e3bf5c71f27b88d69a
---
 src/com/android/browser/NavigationBarPhone.java | 31 -------------------------
 1 file changed, 31 deletions(-)

(limited to 'src/com/android/browser/NavigationBarPhone.java')

diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index 2030169af..400b6955a 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -167,30 +167,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
         return mMenuShowing;
     }
 
-    void showMenu() {
-        // called from menu key, use tab switcher as anchor
-        mMenuShowing = true;
-        if (isEditingUrl()) {
-            stopEditingUrl();
-            post(new Runnable() {
-                @Override
-                public void run() {
-                    showMenu();
-                }
-            });
-        } else {
-            mBaseUi.getTitleBar().setSkipTitleBarAnimations(true);
-            mBaseUi.showTitleBar();
-            mBaseUi.getTitleBar().setSkipTitleBarAnimations(false);
-            post(new Runnable() {
-                @Override
-                public void run() {
-                    showMenu(mTabSwitcher);
-                }
-            });
-        }
-    }
-
     void showMenu(View anchor) {
         mMenuShowing = true;
         mPopupMenu = new PopupMenu(mContext, anchor);
@@ -202,13 +178,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
         mPopupMenu.show();
     }
 
-    void dismissMenu() {
-       if (mPopupMenu != null) {
-           mPopupMenu.dismiss();
-           mBaseUi.suggestHideTitleBar();
-       }
-    }
-
     @Override
     public void onDismiss(PopupMenu menu) {
         onMenuHidden();
-- 
cgit v1.2.3