From e8a823329e004c4261ee5f810e1ca3ebd90914dd Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Wed, 25 Apr 2012 14:14:26 -0700
Subject: Fix QuickControls after title bar tweaks

  Bug: 6398599

Minor cleanup in title bar code.

Change-Id: I55357acb86050e549d80d44d99f4a89ed1e49e9d
---
 src/com/android/browser/BaseUi.java   |  9 +++++++++
 src/com/android/browser/PhoneUi.java  |  6 ++----
 src/com/android/browser/Tab.java      |  6 ------
 src/com/android/browser/TitleBar.java |  8 ++++----
 src/com/android/browser/XLargeUi.java | 15 ---------------
 5 files changed, 15 insertions(+), 29 deletions(-)

(limited to 'src/com/android')

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 7b7e25fcb..01c7da6e5 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -223,6 +223,14 @@ public abstract class BaseUi implements UI {
         onProgressChanged(tab);
     }
 
+    @Override
+    public void onProgressChanged(Tab tab) {
+        int progress = tab.getLoadProgress();
+        if (tab.inForeground()) {
+            mTitleBar.setProgress(progress);
+        }
+    }
+
     @Override
     public void bookmarkedStatusHasChanged(Tab tab) {
         if (tab.inForeground()) {
@@ -270,6 +278,7 @@ public abstract class BaseUi implements UI {
             if (mUseQuickControls) {
                 mPieControl.forceToTop(mContentView);
                 web.setTitleBar(null);
+                mTitleBar.hide();
             } else {
                 web.setTitleBar(mTitleBar);
                 mTitleBar.onScrollChanged();
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index b2695869f..ed63daac5 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -103,10 +103,7 @@ public class PhoneUi extends BaseUi {
 
     @Override
     public void onProgressChanged(Tab tab) {
-        if (tab.inForeground()) {
-            int progress = tab.getLoadProgress();
-            mTitleBar.setProgress(progress);
-        }
+        super.onProgressChanged(tab);
         if (mNavScreen == null && getTitleBar().getHeight() > 0) {
             mHandler.sendEmptyMessage(MSG_INIT_NAVSCREEN);
         }
@@ -145,6 +142,7 @@ public class PhoneUi extends BaseUi {
         if (mUseQuickControls) {
             mPieControl.forceToTop(mContentView);
             view.setTitleBar(null);
+            mTitleBar.setShowProgressOnly(true);
         } else {
             view.setTitleBar(mTitleBar);
         }
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index cbda456a1..73f5b9e62 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -1958,12 +1958,6 @@ class Tab implements PictureListener {
         return mInPageLoad;
     }
 
-    // force mInLoad to be false. This should only be called before closing the
-    // tab to ensure BrowserActivity's pauseWebViewTimers() is called correctly.
-    void clearInPageLoad() {
-        mInPageLoad = false;
-    }
-
     /**
      * @return The Bundle with the tab's state if it can be saved, otherwise null
      */
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index f7ca0d46d..9ec972bc5 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -228,7 +228,7 @@ public class TitleBar extends RelativeLayout {
             // check if needs to be hidden
             if (!isEditingUrl() && !wantsToBeVisible()) {
                 if (mUseQuickControls) {
-                    setShowProgressOnly(false);
+                    hide();
                 } else {
                     mBaseUi.showTitleBarForDuration();
                 }
@@ -241,10 +241,10 @@ public class TitleBar extends RelativeLayout {
             }
             mProgress.setProgress(newProgress * PageProgressView.MAX_PROGRESS
                     / PROGRESS_MAX);
+            if (mUseQuickControls && !isEditingUrl()) {
+                setShowProgressOnly(true);
+            }
             if (!mShowing) {
-                if (mUseQuickControls && !isEditingUrl()) {
-                    setShowProgressOnly(true);
-                }
                 show();
             }
         }
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 196997862..d7f155971 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -134,21 +134,6 @@ public class XLargeUi extends BaseUi {
 
     // WebView callbacks
 
-    @Override
-    public void onProgressChanged(Tab tab) {
-        int progress = tab.getLoadProgress();
-        if (tab.inForeground()) {
-            mTitleBar.setProgress(progress);
-            if (mUseQuickControls) {
-                if (progress == 100) {
-                    mTitleBar.setShowProgressOnly(false);
-                } else if (!mTitleBar.isEditingUrl()) {
-                    mTitleBar.setShowProgressOnly(true);
-                }
-            }
-        }
-    }
-
     @Override
     public void addTab(Tab tab) {
         mTabBar.onNewTab(tab);
-- 
cgit v1.2.3