am f06113a9: Merge "Clear existing completion when psychic is turned off." into honeycomb-mr1

* commit 'f06113a9c90b72e73af2f63d93fd2debd9b7cd3c':
  Clear existing completion when psychic is turned off.

3 files changed, 12 insertions, 4 deletions

diff --git a/src/com/android/browser/InstantSearchEngine.java b/src/com/android/browser/InstantSearchEngine.java
index b4ccfa5..85e494a 100644
--- a/src/com/android/browser/InstantSearchEngine.java
+++ b/src/com/android/browser/InstantSearchEngine.java
@@ -15,13 +15,9 @@
  */
 package com.android.browser;
 
-import com.google.android.collect.Maps;
-import com.google.common.collect.Lists;
-
 import com.android.browser.Controller;
 import com.android.browser.R;
 import com.android.browser.UI.DropdownChangeListener;
-import com.android.browser.search.DefaultSearchEngine;
 import com.android.browser.search.SearchEngine;
 
 import android.app.SearchManager;
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 193538a..51cf0c3 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -395,6 +395,10 @@ public class TitleBarXLarge extends TitleBarBase
         return super.focusSearch(focused, dir);
     }
 
+    void clearCompletions() {
+        mUrlInput.setSuggestedText(null);
+    }
+
     @Override
     public boolean dispatchKeyEventPreIme(KeyEvent evt) {
         if (evt.getKeyCode() == KeyEvent.KEYCODE_BACK) {
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 892b118..9b5a884 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -131,6 +131,14 @@ public class XLargeUi extends BaseUi implements ScrollListener {
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+        if (!BrowserSettings.getInstance().useInstant()) {
+            mTitleBar.clearCompletions();
+        }
+    }
+
+    @Override
     public void onDestroy() {
         hideTitleBar();
     }