commit 8f11d06710c2c2be8e441ffe07c8fcd1195057be
author Michael Kolb <kolby@google.com> Mon Apr 25 12:47:07 2011 -0700
committer Michael Kolb <kolby@google.com> Mon Apr 25 13:32:18 2011 -0700
tree c58247fb5d0b7711eec84f287afebaf2c74c23d1
parent a2840776961b995f0e2c3a220dca1563be2f44dc

fix pie menu handling

Change-Id: Iab2bc23c2200799dbb0983b43ef66891bb51215d

res/drawable-hdpi/progress.9.png

diff --git a/res/drawable-hdpi/progress.9.png b/res/drawable-hdpi/progress.9.png
index 398bee4..2bfc699 100644
--- a/res/drawable-hdpi/progress.9.png
+++ b/res/drawable-hdpi/progress.9.png
Binary files differ

res/layout/title_bar.xml

diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index e443ee5..4087640 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -138,10 +138,10 @@
     <com.android.browser.PageProgressView
         android:id="@+id/progress"
         android:layout_width="match_parent"
-        android:layout_height="22dip"
+        android:layout_height="wrap_content"
         android:background="@null"
         android:layout_below="@+id/taburlbar"
         android:src="@drawable/progress"
-        android:layout_marginTop="-11dip"
+        android:layout_marginTop="-8dip"
         android:visibility="gone" />
 </RelativeLayout>
\ No newline at end of file

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index f2ace49..17cc632 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -283,16 +283,6 @@
     }
 
     @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);

src/com/android/browser/PieControl.java

diff --git a/src/com/android/browser/PieControl.java b/src/com/android/browser/PieControl.java
index 81a6c1f..684cd1a 100644
--- a/src/com/android/browser/PieControl.java
+++ b/src/com/android/browser/PieControl.java
@@ -107,7 +107,7 @@
             menuview.setLayoutListener(new OnLayoutListener() {
                 @Override
                 public void onLayout(int ax, int ay, boolean left) {
-                    mActivity.openOptionsMenu();
+                    buildMenu();
                 }
             });
 
@@ -146,7 +146,9 @@
 
     }
 
-    protected void onMenuOpened(Menu menu) {
+    private void buildMenu() {
+        Menu menu = mUi.getMenu();
+        menu.setGroupVisible(R.id.NAV_MENU, false);
         mMenuAdapter.setMenu(menu);
     }
 

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 39981b0..c135fbc 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -26,7 +26,6 @@
 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 @@
         return mTabBar;
     }
 
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (mUseQuickControls) {
-            mPieControl.onMenuOpened(menu);
-            return false;
-        } else {
-            return true;
-        }
-    }
-
 }