Merge "fix pie menu handling"

3 files changed, 4 insertions, 23 deletions

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index b2435a3b..063fcb9e 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -284,16 +284,6 @@ public class PhoneUi extends BaseUi {
     }
 
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (mUseQuickControls) {
-            menu.setGroupVisible(R.id.NAV_MENU, false);
-            mPieControl.onMenuOpened(menu);
-            return false;
-        }
-        return true;
-    }
-
-    @Override
     protected void captureTab(final Tab tab) {
         if (mUseQuickControls) {
             super.captureTab(tab);
diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index 81a6c1f2..684cd1a1 100644
--- a/src/com/android/browser/PieControl.java
+++ b/src/com/android/browser/PieControl.java
@@ -107,7 +107,7 @@ public class PieControl implements OnClickListener, PieMenu.PieController {
             menuview.setLayoutListener(new OnLayoutListener() {
                 @Override
                 public void onLayout(int ax, int ay, boolean left) {
-                    mActivity.openOptionsMenu();
+                    buildMenu();
                 }
             });
 
@@ -146,7 +146,9 @@ public class PieControl implements OnClickListener, PieMenu.PieController {
 
     }
 
-    protected void onMenuOpened(Menu menu) {
+    private void buildMenu() {
+        Menu menu = mUi.getMenu();
+        menu.setGroupVisible(R.id.NAV_MENU, false);
         mMenuAdapter.setMenu(menu);
     }
 
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 39981b07..c135fbc5 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -26,7 +26,6 @@ import android.util.Log;
 import android.view.ActionMode;
 import android.view.Gravity;
 import android.view.KeyEvent;
-import android.view.Menu;
 import android.view.View;
 import android.webkit.WebChromeClient.CustomViewCallback;
 import android.webkit.WebView;
@@ -401,14 +400,4 @@ public class XLargeUi extends BaseUi implements ScrollListener {
         return mTabBar;
     }
 
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (mUseQuickControls) {
-            mPieControl.onMenuOpened(menu);
-            return false;
-        } else {
-            return true;
-        }
-    }
-
 }