fix qc urlbar position and show in auto-login

    Bug: 4108540
    Show the url bar when auto-login is in progress
    Move url bar to top in QuickControls to work with instant
    search
    Remove suggestions reversal

Change-Id: I0040fa74dd26b5eecdab278c0104199fe5269aba

1 files changed, 2 insertions, 7 deletions

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 02533b035..13a055703 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -107,17 +107,16 @@ public class XLargeUi extends BaseUi implements ScrollListener {
             if ((tab != null) && (tab.getWebView() != null)) {
                 tab.getWebView().setEmbeddedTitleBar(null);
             }
-            setTitleGravity(Gravity.BOTTOM);
         } else {
             mActivity.getActionBar().show();
             if (mPieControl != null) {
                 mPieControl.removeFromContainer(mContentView);
             }
-            setTitleGravity(Gravity.TOP);
             WebView web = mTabControl.getCurrentWebView();
             if (web != null) {
                 web.setEmbeddedTitleBar(mTitleBar);
             }
+            setTitleGravity(Gravity.NO_GRAVITY);
         }
         mTabBar.setUseQuickControls(mUseQuickControls);
     }
@@ -190,11 +189,10 @@ public class XLargeUi extends BaseUi implements ScrollListener {
         if (tab.inForeground()) {
             mTitleBar.setProgress(progress);
             if (progress == 100) {
-                if (!mTitleBar.isEditingUrl()) {
+                if (!mTitleBar.isEditingUrl() && !mTitleBar.inAutoLogin()) {
                     hideTitleBar();
                     if (mUseQuickControls) {
                         mTitleBar.setShowProgressOnly(false);
-                        setTitleGravity(Gravity.BOTTOM);
                     }
                 }
             } else {
@@ -450,9 +448,6 @@ public class XLargeUi extends BaseUi implements ScrollListener {
             // if the page is loading, show it again
             if (mUseQuickControls) {
                 mTitleBar.setShowProgressOnly(true);
-                if (!isTitleBarShowing()) {
-                    setTitleGravity(Gravity.TOP);
-                }
             }
             showTitleBar();
         }