From 42229bcdea8a1623d9ac3fce099793a3767fb14d Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 19 Aug 2011 13:26:43 -0700
Subject: YAMR - Yet Another Menu Reorg

 Bug: 5186166

Change-Id: Icd459c8f9cd557659a5402431a843a856fb1b134
---
 src/com/android/browser/NavigationBarPhone.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 d2d3797e5..5cabe3180 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -27,11 +27,12 @@ import android.webkit.WebView;
 import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.PopupMenu.OnDismissListener;
+import android.widget.PopupMenu.OnMenuItemClickListener;
 
 import com.android.browser.UrlInputView.StateListener;
 
 public class NavigationBarPhone extends NavigationBarBase implements
-        StateListener {
+        StateListener, OnMenuItemClickListener, OnDismissListener {
 
     private ImageView mStopButton;
     private ImageView mVoiceButton;
@@ -81,7 +82,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
         mStopDescription = res.getString(R.string.accessibility_button_stop);
         mRefreshDescription = res.getString(R.string.accessibility_button_refresh);
         mTextfieldBgDrawable = res.getDrawable(R.drawable.textfield_active_holo_dark);
-        setUaSwitcher(mComboIcon);
         mUrlInput.setContainer(this);
         mUrlInput.setStateListener(this);
         mNeedsMenu = !ViewConfiguration.get(getContext()).hasPermanentMenuKey();
@@ -182,7 +182,6 @@ public class NavigationBarPhone extends NavigationBarBase implements
         if (menu == mPopupMenu) {
             onMenuHidden();
         }
-        super.onDismiss(menu);
     }
 
     private void onMenuHidden() {
@@ -240,4 +239,9 @@ public class NavigationBarPhone extends NavigationBarBase implements
                 ? View.VISIBLE : View.GONE);
     }
 
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        return mUiController.onOptionsItemSelected(item);
+    }
+
 }
-- 
cgit v1.2.3