commit 5bb316b3239dca8ff4dc2f9007cc6567feed12ca
author John Reck <jreck@google.com> Thu Aug 18 15:54:19 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 18 15:54:19 2011 -0700
tree fed106f3cf0a55bba85485e95381e78ed5fac90c
parent 804ba43b4846368ca8f9a1c493a2483cb6b5d6de
parent 2a7d56c36ce0229a807aae22d7dd15defbddc199

Merge "Fix popup favicon menu handling"

src/com/android/browser/NavigationBarBase.java

diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index cbf6eba..ab79b37 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -156,7 +156,7 @@
             }
             return true;
         }
-        return false;
+        return mUiController.onOptionsItemSelected(item);
     }
 
     @Override

src/com/android/browser/NavigationBarPhone.java

diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index ff7dc7c..d2d3797 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -185,16 +185,6 @@
         super.onDismiss(menu);
     }
 
-    @Override
-    public boolean onMenuItemClick(MenuItem item) {
-        onMenuHidden();
-        boolean res = mUiController.onOptionsItemSelected(item);
-        if (!res) {
-            return super.onMenuItemClick(item);
-        }
-        return res;
-    }
-
     private void onMenuHidden() {
         mOverflowMenuShowing = false;
         mPopupMenu = null;