Titlebar Autoshow tweaks

 Also consolidate some common code between phone and tablet

Change-Id: I2e1be9be84b07726596d4b4fe7345c0074236be1
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index 1ea6071..8584afa 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -276,12 +276,9 @@
     public void onScroll(int visibleTitleHeight, boolean userInitiated) {
         if (mUseQuickControls) return;
         // isLoading is using the current tab, which initially might not be set yet
-        if (mTabControl.getCurrentTab() != null
-                && !isLoading()) {
-            if (visibleTitleHeight == 0) {
-                if (!showsTitleBarIndicator()
-                        && (!mUi.isEditingUrl() || userInitiated)) {
-                    mUi.hideTitleBar();
+        if (mTabControl.getCurrentTab() != null) {
+            if (visibleTitleHeight == 0 && !mUi.isTitleBarShowing()) {
+                if (!showsTitleBarIndicator()) {
                     showTitleBarIndicator(true);
                 }
             } else {