1 files changed, 17 insertions, 55 deletions

diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index 6c9130a2..1ea4dad5 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -55,7 +55,6 @@ public class TitleBar extends RelativeLayout {
     private AccessibilityManager mAccessibilityManager;
 
     private NavigationBarBase mNavBar;
-    private boolean mUseQuickControls;
     private SnapshotBar mSnapshotBar;
 
     //state
@@ -113,8 +112,7 @@ public class TitleBar extends RelativeLayout {
     }
 
     private void setFixedTitleBar() {
-        boolean isFixed = !mUseQuickControls
-                && !getContext().getResources().getBoolean(R.bool.hide_title);
+        boolean isFixed = !getContext().getResources().getBoolean(R.bool.hide_title);
 
         isFixed |= mAccessibilityManager.isEnabled();
         // If getParent() returns null, we are initializing
@@ -143,18 +141,6 @@ public class TitleBar extends RelativeLayout {
         return mUiController;
     }
 
-    public void setUseQuickControls(boolean use) {
-        mUseQuickControls = use;
-        setFixedTitleBar();
-        if (use) {
-            this.setVisibility(View.GONE);
-            hideTopControls();
-        } else {
-            this.setVisibility(View.VISIBLE);
-            enableTopControls();
-        }
-    }
-
     void setShowProgressOnly(boolean progress) {
         if (progress && !wantsToBeVisible()) {
             mNavBar.setVisibility(View.GONE);
@@ -179,7 +165,7 @@ public class TitleBar extends RelativeLayout {
     private static final  boolean bOldStyleAutoHideDisabled = true;
     void show() {
         cancelTitleBarAnimation(false);
-        if (mUseQuickControls || mSkipTitleBarAnimations) {
+        if (mSkipTitleBarAnimations) {
             this.setVisibility(View.VISIBLE);
             this.setTranslationY(0);
             hideTopControls();
@@ -200,23 +186,18 @@ public class TitleBar extends RelativeLayout {
     }
 
     void hide() {
-        if (mUseQuickControls) {
-            this.setVisibility(View.GONE);
-            hideTopControls();
+        if (mIsFixedTitleBar || bOldStyleAutoHideDisabled) return;
+        if (!mSkipTitleBarAnimations) {
+            cancelTitleBarAnimation(false);
+            int visibleHeight = getVisibleTitleHeight();
+            mTitleBarAnimator = ObjectAnimator.ofFloat(this,
+                    "translationY", getTranslationY(),
+                    (-getEmbeddedHeight() + visibleHeight));
+            mTitleBarAnimator.addListener(mHideTileBarAnimatorListener);
+            setupTitleBarAnimator(mTitleBarAnimator);
+            mTitleBarAnimator.start();
         } else {
-            if (mIsFixedTitleBar || bOldStyleAutoHideDisabled) return;
-            if (!mSkipTitleBarAnimations) {
-                cancelTitleBarAnimation(false);
-                int visibleHeight = getVisibleTitleHeight();
-                mTitleBarAnimator = ObjectAnimator.ofFloat(this,
-                        "translationY", getTranslationY(),
-                        (-getEmbeddedHeight() + visibleHeight));
-                mTitleBarAnimator.addListener(mHideTileBarAnimatorListener);
-                setupTitleBarAnimator(mTitleBarAnimator);
-                mTitleBarAnimator.start();
-            } else {
-                onScrollChanged();
-            }
+            onScrollChanged();
         }
         mShowing = false;
     }
@@ -298,19 +279,11 @@ public class TitleBar extends RelativeLayout {
             mNavBar.onProgressStopped();
             // check if needs to be hidden
             if (!isEditingUrl() && !wantsToBeVisible()) {
-                if (mUseQuickControls) {
-                    hide();
-                } else {
-                    mBaseUi.showTitleBarForDuration();
-                }
+                mBaseUi.showTitleBarForDuration();
             }
 
             //onPageFinished
-            if (mUseQuickControls) {
-                hideTopControls();
-            } else {
-                enableTopControls();
-            }
+            enableTopControls();
 
         } else {
             if (!mInLoad) {
@@ -319,17 +292,10 @@ public class TitleBar extends RelativeLayout {
                 mNavBar.onProgressStarted();
 
                 //onPageStarted
-                if (mUseQuickControls) {
-                    hideTopControls();
-                } else {
-                    showTopControls();
-                }
+                showTopControls();
             }
             mProgress.setProgress(newProgress * PageProgressView.MAX_PROGRESS
                     / PROGRESS_MAX);
-            if (mUseQuickControls && !isEditingUrl()) {
-                setShowProgressOnly(true);
-            }
             if (!mShowing) {
                 show();
             }
@@ -337,7 +303,7 @@ public class TitleBar extends RelativeLayout {
     }
 
     public int getEmbeddedHeight() {
-        if (mUseQuickControls || mIsFixedTitleBar) return 0;
+        if (mIsFixedTitleBar) return 0;
         return calculateEmbeddedHeight();
     }
 
@@ -376,10 +342,6 @@ public class TitleBar extends RelativeLayout {
         return mNavBar;
     }
 
-    public boolean useQuickControls() {
-        return mUseQuickControls;
-    }
-
     public boolean isInLoad() {
         return mInLoad;
     }