commit 3bec6a3b7fe6dd30e9dd2a2065ffca19ff6af542
author Vivek Sekhar <vsekhar@codeaurora.org> Wed Oct 22 17:03:42 2014 -0700
committer Vivek Sekhar <vsekhar@codeaurora.org> Thu Oct 23 11:14:07 2014 -0700
tree b9a75dba5245a4ee39ccc0d5163e9f93acd57a30
parent 46c3ec0fec8a2fc53619cead8dae5edbae2a6f3a

Remove quick controls

Change-Id: I0fa64f0fcd800db0c8d5c91dcbbcc265f4d8eb48

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 666b997..354e901 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -110,10 +110,8 @@
     private View mVideoProgressView;
 
     private boolean mActivityPaused;
-    protected boolean mUseQuickControls;
     protected TitleBar mTitleBar;
     private NavigationBarBase mNavigationBar;
-    protected PieControl mPieControl;
     private boolean mBlockFocusAnimations;
 
     public BaseUi(Activity browser, UiController controller) {
@@ -206,21 +204,6 @@
         return false;
     }
 
-    @Override
-    public void setUseQuickControls(boolean useQuickControls) {
-        mUseQuickControls = useQuickControls;
-        mTitleBar.setUseQuickControls(mUseQuickControls);
-        if (useQuickControls) {
-            mPieControl = new PieControl(mActivity, mUiController, this);
-            mPieControl.attachToContainer(mContentView);
-        } else {
-            if (mPieControl != null) {
-                mPieControl.removeFromContainer(mContentView);
-            }
-        }
-        updateUrlBarAutoShowManagerTarget();
-    }
-
     // Tab callbacks
     @Override
     public void onTabDataChanged(Tab tab) {
@@ -290,14 +273,8 @@
         attachTabToContentView(tab);
         if (web != null) {
             // Request focus on the top window.
-            if (mUseQuickControls) {
-                mPieControl.forceToTop(mContentView);
-                web.setTitleBar(null);
-                mTitleBar.hide();
-            } else {
-                web.setTitleBar(mTitleBar);
-                mTitleBar.onScrollChanged();
-            }
+            web.setTitleBar(mTitleBar);
+            mTitleBar.onScrollChanged();
             tabToWaitFor = mActiveTab;
         }
         mTitleBar.bringToFront();
@@ -367,10 +344,8 @@
 
     protected void updateUrlBarAutoShowManagerTarget() {
         WebView web = mActiveTab != null ? mActiveTab.getWebView() : null;
-        if (!mUseQuickControls && web instanceof BrowserWebView) {
+        if (web instanceof BrowserWebView) {
             mUrlBarAutoShowManager.setTarget((BrowserWebView) web);
-        } else {
-            mUrlBarAutoShowManager.setTarget(null);
         }
     }
 
@@ -828,8 +803,7 @@
                 mTitleBar.setEnabled(true);
             }
 
-            if (!mUseQuickControls)
-                mTitleBar.setTranslationY(topControlsOffsetYPix);
+            mTitleBar.setTranslationY(topControlsOffsetYPix);
         }
     }