summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/drawable-hdpi/progress.9.pngbin5570 -> 1457 bytes
-rw-r--r--res/layout/title_bar.xml4
-rw-r--r--src/com/android/browser/PhoneUi.java10
-rw-r--r--src/com/android/browser/PieControl.java6
-rw-r--r--src/com/android/browser/XLargeUi.java11
5 files changed, 6 insertions, 25 deletions
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
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
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index b2435a3..063fcb9 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 81a6c1f..684cd1a 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 39981b0..c135fbc 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;
- }
- }
-
}