commit 67b8c1b4336a77414c74bce6152495502d4bde04
author Narayan Kamath <narayan@google.com> Wed Mar 09 20:47:52 2011 +0000
committer Narayan Kamath <narayan@google.com> Wed Mar 09 20:56:39 2011 +0000
tree 21284b7ec9eb0ef6ab14966e08989bb4e56046dd
parent 66996bfa98bcf98f2ea944ddd27439f554f8f0b9

Clear existing completion when psychic is turned off.

bug: 4076245
Change-Id: Ibbdd5f40927550e508631ce17663e8ee2b01ca82

src/com/android/browser/InstantSearchEngine.java

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;

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 8a715b1..cbe666c 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -396,6 +396,10 @@
         return super.focusSearch(focused, dir);
     }
 
+    void clearCompletions() {
+        mUrlInput.setSuggestedText(null);
+    }
+
     @Override
     public boolean dispatchKeyEventPreIme(KeyEvent evt) {
         if (evt.getKeyCode() == KeyEvent.KEYCODE_BACK) {

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index d940b50..2bcfe35 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -135,6 +135,14 @@
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+        if (!BrowserSettings.getInstance().useInstant()) {
+            mTitleBar.clearCompletions();
+        }
+    }
+
+    @Override
     public void onDestroy() {
         hideTitleBar();
     }