summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-01-18 14:24:43 -0800
committerJohn Reck <jreck@google.com>2011-01-18 14:24:43 -0800
commit07af2b8ae04c6e4385e41e0c559280a995eb8035 (patch)
tree20ef34d3feaec588301f92a122964aa76673978b /src/com
parent963243527d67fd6c2ada3899c452de94d8d9f8e5 (diff)
downloadpackages_apps_Browser-07af2b8ae04c6e4385e41e0c559280a995eb8035.tar.gz
packages_apps_Browser-07af2b8ae04c6e4385e41e0c559280a995eb8035.tar.bz2
packages_apps_Browser-07af2b8ae04c6e4385e41e0c559280a995eb8035.zip
Remove combo view on new intent
Bug: 3365077 Make sure we remove the combo view when a new intent is received, after we check if the intent is to show the combo view or to bring the browser to the foreground (from history and/or launcher) Change-Id: If6e6647192246d96d7122232c26229b05a3f3888
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/browser/IntentHandler.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/browser/IntentHandler.java b/src/com/android/browser/IntentHandler.java
index 2a34aba04..9c5097533 100644
--- a/src/com/android/browser/IntentHandler.java
+++ b/src/com/android/browser/IntentHandler.java
@@ -87,10 +87,8 @@ public class IntentHandler {
mController.bookmarksOrHistoryPicker(false);
return;
}
- if (BrowserActivity.ACTION_SHOW_BROWSER.equals(action)) {
- mController.removeComboView();
- return;
- }
+ mController.removeComboView();
+
// In case the SearchDialog is open.
((SearchManager) mActivity.getSystemService(Context.SEARCH_SERVICE))
.stopSearch();