commit 8a4c38243de9d19162c883d3b20df65f8bcba81a
author Michael Kolb <kolby@google.com> Tue Mar 15 14:52:05 2011 -0700
committer Michael Kolb <kolby@google.com> Wed Mar 16 11:05:13 2011 -0700
tree 801ccc532ee3b59036c58790946abbe03580728b
parent 619a86c8edce2e86aab75c45a6edbbdc691446b8

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

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index be5e90f..ccbb38d 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -211,20 +211,33 @@
                 default:
                     throw new IllegalStateException();
             }
-            if (animate) {
-                mAutoLogin.startAnimation(AnimationUtils.loadAnimation(
-                        getContext(), R.anim.autologin_enter));
+            if (mUseQuickControls) {
+                mUi.showTitleBar();
+            } else {
+                if (animate) {
+                    mAutoLogin.startAnimation(AnimationUtils.loadAnimation(
+                            getContext(), R.anim.autologin_enter));
+                }
             }
         } else {
             mAutoLoginHandler = null;
-            if (animate) {
-                hideAutoLogin();
-            } else if (mAutoLogin.getAnimation() == null) {
+            if (mUseQuickControls) {
+                mUi.hideTitleBar();
                 mAutoLogin.setVisibility(View.GONE);
+            } else {
+                if (animate) {
+                    hideAutoLogin();
+                } else if (mAutoLogin.getAnimation() == null) {
+                    mAutoLogin.setVisibility(View.GONE);
+                }
             }
         }
     }
 
+    boolean inAutoLogin() {
+        return mAutoLoginHandler != null;
+    }
+
     private ViewGroup.LayoutParams makeLayoutParams() {
         if (mUseQuickControls) {
             return new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
@@ -247,12 +260,11 @@
 
     void setUseQuickControls(boolean useQuickControls) {
         mUseQuickControls = useQuickControls;
-        mUrlInput.setUseQuickControls(mUseQuickControls);
         setLayoutParams(makeLayoutParams());
     }
 
     void setShowProgressOnly(boolean progress) {
-        if (progress) {
+        if (progress && !inAutoLogin()) {
             mContainer.setVisibility(View.GONE);
         } else {
             mContainer.setVisibility(View.VISIBLE);