commit 0241e7556501caae1f57d2bdf3677d7e4a619eb0
author Michael Kolb <kolby@google.com> Thu Jul 07 14:58:50 2011 -0700
committer Michael Kolb <kolby@google.com> Mon Jul 11 12:55:16 2011 -0700
tree bfd41aade0cdc406c7d73d8ef4f462e779e58b20
parent aec28a4b000c1e476c7c730f609cc04c0c8dc5b9

make QC work on phone

     Reduce options in QC menu on phone
     Avoid restart when enabling/disabling QC
     Bug: 3326929

Change-Id: I5119c4df99226dcb28f47a95471872fbf51be48e

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 0c236af..20c90f6 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -36,7 +36,7 @@
 
     private TitleBarPhone mTitleBar;
     private ActiveTabsPage mActiveTabsPage;
-    private PieControl mPieControl;
+    private PieControlPhone mPieControl;
     private NavScreen mNavScreen;
 
     boolean mExtendedMenuOpen;
@@ -262,15 +262,18 @@
         }
     }
 
-    private void setUseQuickControls(boolean useQuickControls) {
+    @Override
+    public void setUseQuickControls(boolean useQuickControls) {
         mUseQuickControls = useQuickControls;
         getTitleBar().setUseQuickControls(mUseQuickControls);
         if (useQuickControls) {
-            mPieControl = new PieControl(mActivity, mUiController, this);
+            mPieControl = new PieControlPhone(mActivity, mUiController, this);
             mPieControl.attachToContainer(mContentView);
             WebView web = getWebView();
             if (web != null) {
                 web.setEmbeddedTitleBar(null);
+                // don't show url bar on scrolling
+                web.setOnTouchListener(null);
             }
         } else {
             if (mPieControl != null) {
@@ -279,6 +282,8 @@
             WebView web = getWebView();
             if (web != null) {
                 web.setEmbeddedTitleBar(mTitleBar);
+                // show url bar on scrolling
+                web.setOnTouchListener(this);
             }
             setTitleGravity(Gravity.NO_GRAVITY);
         }