diff options
| author | Michael Kolb <kolby@google.com> | 2011-01-27 15:29:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-27 15:29:46 -0800 |
| commit | ba58657f269b289186764c5b9ba4bd42318033d8 (patch) | |
| tree | 6edde3d24cec6b099f33b7d9864c4bdd16d7b9bc /src | |
| parent | 00a3e3cde6e37ea55043c60063a9871a6050c89c (diff) | |
| parent | aba9243e8eb16e8739f99cce66799bc1a336bc49 (diff) | |
| download | packages_apps_Browser-ba58657f269b289186764c5b9ba4bd42318033d8.zip packages_apps_Browser-ba58657f269b289186764c5b9ba4bd42318033d8.tar.gz packages_apps_Browser-ba58657f269b289186764c5b9ba4bd42318033d8.tar.bz2 | |
Merge "fix SOX in clearFocus" into honeycomb
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/TitleBarXLarge.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ public class TitleBarXLarge extends TitleBarBase i.putExtra(SearchManager.APP_DATA, appData); } mUiController.handleNewIntent(i); - setUrlMode(false); setDisplayTitle(text); } @@ -313,7 +312,6 @@ public class TitleBarXLarge extends TitleBarBase 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 @@ public class TitleBarXLarge extends TitleBarBase 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); |