commit 2ade32581d828adb39af710cc2e9e9b8668226c9
author John Reck <jreck@google.com> Tue Jan 04 10:42:43 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 04 10:42:43 2011 -0800
tree 8dbe24de87ba47d4d99ea77b40433b58aa50a652
parent afe928ebb2c1e9b78b2338917482ddc7f72f88cd
parent dcf911c7cb1c3eeb8b073d69c2ccd96e6179b4a8

Merge "Hide fake title bar on scroll"

src/com/android/browser/TabBar.java

diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 88209fe..32e19a1 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -238,16 +238,12 @@
     public void onScroll(int visibleTitleHeight) {
         if (mUseQuickControls) return;
         // isLoading is using the current tab, which initially might not be set yet
-        if (mTabControl.getCurrentTab() != null) {
-            if ((mVisibleTitleHeight != 0) && (visibleTitleHeight == 0)
-                    && !isLoading()) {
-                if (mUserRequestedUrlbar) {
-                    mUi.hideFakeTitleBar();
-                } else {
-                    showTitleBarIndicator(true);
-                }
-            } else if ((mVisibleTitleHeight == 0) && (visibleTitleHeight != 0)
-                    && !isLoading()) {
+        if (mTabControl.getCurrentTab() != null
+                && !isLoading()) {
+            if (visibleTitleHeight == 0) {
+                mUi.hideFakeTitleBar();
+                showTitleBarIndicator(true);
+            } else {
                 showTitleBarIndicator(false);
             }
         }