commit bd018d44c193f7afe5f3c0839766ff1ab19712b9
author Michael Kolb <kolby@google.com> Wed Dec 15 15:43:39 2010 -0800
committer Michael Kolb <kolby@google.com> Wed Dec 15 15:59:33 2010 -0800
tree 7f4114802fa0bd42b1e41e041e9a40e5b4a50871
parent 958b24285bba0163bc4121a3fc0fb116aa563ed9

Protect url editing from progress changes

    Also fixes url bar disappearing when selection mode is entered

Change-Id: I87ec4ac9bb3abd9e472df9f565bf8b0f6d1f510e

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index f1c6c6b..496246c 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -186,6 +186,11 @@
      * @param clearInput clear the input field
      */
     void onEditUrl(boolean clearInput) {
+        // editing takes preference of progress
+        mContainer.setVisibility(View.VISIBLE);
+        if (mUseQuickControls) {
+            mProgressView.setVisibility(View.GONE);
+        }
         if (!mUrlInput.hasFocus()) {
             mUrlInput.requestFocus();
         }
@@ -341,16 +346,21 @@
      */
     @Override
     void setProgress(int newProgress) {
+        boolean blockvisuals = mUseQuickControls && isEditingUrl();
         if (newProgress >= PROGRESS_MAX) {
-            mProgressView.setProgress(PageProgressView.MAX_PROGRESS);
-            mProgressView.setVisibility(View.GONE);
+            if (!blockvisuals) {
+                mProgressView.setProgress(PageProgressView.MAX_PROGRESS);
+                mProgressView.setVisibility(View.GONE);
+                mStopButton.setImageDrawable(mReloadDrawable);
+            }
             mInLoad = false;
-            mStopButton.setImageDrawable(mReloadDrawable);
         } else {
             if (!mInLoad) {
-                mProgressView.setVisibility(View.VISIBLE);
+                if (!blockvisuals) {
+                    mProgressView.setVisibility(View.VISIBLE);
+                    mStopButton.setImageDrawable(mStopDrawable);
+                }
                 mInLoad = true;
-                mStopButton.setImageDrawable(mStopDrawable);
             }
             mProgressView.setProgress(newProgress * PageProgressView.MAX_PROGRESS
                     / PROGRESS_MAX);