summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-01-27 14:01:53 -0800
committerMichael Kolb <kolby@google.com>2011-01-27 14:02:00 -0800
commitaba9243e8eb16e8739f99cce66799bc1a336bc49 (patch)
tree7a6a05edcfbf653c40803ad4cc9e037e2cbd61ae /src/com/android
parent02dd4e94bfb4fa3f8827190ccccc9bf2a836ee8e (diff)
downloadpackages_apps_Browser-aba9243e8eb16e8739f99cce66799bc1a336bc49.zip
packages_apps_Browser-aba9243e8eb16e8739f99cce66799bc1a336bc49.tar.gz
packages_apps_Browser-aba9243e8eb16e8739f99cce66799bc1a336bc49.tar.bz2
fix SOX in clearFocus
http://b/issue?id=3373046 don't clear focus when already not focused Change-Id: I8a445b84416c156a4f72196439502670ac57b177
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/TitleBarXLarge.java6
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);