commit 2a7d56c36ce0229a807aae22d7dd15defbddc199
author John Reck <jreck@google.com> Thu Aug 18 14:36:17 2011 -0700
committer John Reck <jreck@google.com> Thu Aug 18 14:36:17 2011 -0700
tree de8363915fc4f382f5bcb6374ca33f2c2eaed17d
parent d51bb570d4806d9e6b3c997bb0868d094f481bf2

Fix popup favicon menu handling

 Bug: 5180985

Change-Id: I60312208dc0e522f49beb302fc289dc5a7471261

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;