commit aba9243e8eb16e8739f99cce66799bc1a336bc49
author Michael Kolb <kolby@google.com> Thu Jan 27 14:01:53 2011 -0800
committer Michael Kolb <kolby@google.com> Thu Jan 27 14:02:00 2011 -0800
tree 7a6a05edcfbf653c40803ad4cc9e037e2cbd61ae
parent 02dd4e94bfb4fa3f8827190ccccc9bf2a836ee8e

fix SOX in clearFocus

    http://b/issue?id=3373046
    don't clear focus when already not focused

Change-Id: I8a445b84416c156a4f72196439502670ac57b177

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 8dc8663..2fd9d3d 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -302,7 +302,6 @@
             i.putExtra(SearchManager.APP_DATA, appData);
         }
         mUiController.handleNewIntent(i);
-        setUrlMode(false);
         setDisplayTitle(text);
     }
 
@@ -313,7 +312,6 @@
             currentTab.getWebView().requestFocus();
         }
         mUi.hideFakeTitleBar();
-        setUrlMode(false);
         // if top != null current must be set
         if ((currentTab != null) && !mInVoiceMode) {
             setDisplayTitle(currentTab.getUrl());
@@ -345,7 +343,9 @@
             mWebIcon.setImageResource(R.drawable.ic_search_holo_dark);
             updateSearchMode();
         } else {
-            mUrlInput.clearFocus();
+            if (mUrlInput.hasFocus()) {
+                mUrlInput.clearFocus();
+            }
             mGoButton.setVisibility(View.GONE);
             mVoiceSearch.setVisibility(View.GONE);
             mStar.setVisibility(View.VISIBLE);