commit a339b50ca0981be22c1d05f5a1321a0b66f18847
author Eric Fischer <enf@google.com> Tue Jan 04 10:58:56 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 04 10:58:56 2011 -0800
tree c387eff0b7e5de18031a0e9d0a1b32a6f766352e
parent a9a0e1d61e6a6c01e9ab9bb035e2fd3f0869e8a4
parent cfff5660153ea569bf0bfb1b096d1f2e0f932a99

Merge changes Ib9b67b9f,Ia8024a23

* changes:
  Import revised translations.
  Fix references to renamed strings.

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);
             }
         }

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 496246c..b479139 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -301,7 +301,7 @@
      */
     @Override
     public void onEdit(String text) {
-        setDisplayTitle(text, true);
+        mUrlInput.setText(text, true);
         if (text != null) {
             mUrlInput.setSelection(text.length());
         }
@@ -380,11 +380,9 @@
 
     @Override
     /* package */ void setDisplayTitle(String title) {
-        mUrlInput.setText(title, false);
-    }
-
-    void setDisplayTitle(String title, boolean filter) {
-        mUrlInput.setText(title, filter);
+        if (!isEditingUrl()) {
+            mUrlInput.setText(title, false);
+        }
     }
 
     // UrlInput text watcher