3 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index e76fa5d..defa5da 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -797,6 +797,10 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
         return mPrefs.getBoolean(PREF_SHOW_SECURITY_WARNINGS, true);
     }
 
+    public boolean showSearchSuggestions() {
+        return mPrefs.getBoolean(PREF_SHOW_SEARCH_SUGGESTIONS, false);
+    }
+
     public boolean acceptCookies() {
         return mPrefs.getBoolean(PREF_ACCEPT_COOKIES, true);
     }
diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java
index 3bb2438..ec99f4f 100644
--- a/src/com/android/browser/PreferenceKeys.java
+++ b/src/com/android/browser/PreferenceKeys.java
@@ -99,6 +99,7 @@ public interface PreferenceKeys {
     static final String PREF_REMEMBER_PASSWORDS = "remember_passwords";
     static final String PREF_SAVE_FORMDATA = "save_formdata";
     static final String PREF_SHOW_SECURITY_WARNINGS = "show_security_warnings";
+    static final String PREF_SHOW_SEARCH_SUGGESTIONS = "show_search_suggestions";
 
     // ----------------------
     // Keys for bandwidth_preferences.xml
diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index 62fa0bc..a759e23 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -202,9 +202,15 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable,
 
         @Override
         protected List<SuggestItem> doInBackground(CharSequence... params) {
+            List<SuggestItem> results = new ArrayList<SuggestItem>();
+
+            // Don't query the search engine if disabled in settings
+            if (!mSettings.showSearchSuggestions()) {
+                return results;
+            }
+
             SuggestCursor cursor = new SuggestCursor();
             cursor.runQuery(params[0]);
-            List<SuggestItem> results = new ArrayList<SuggestItem>();
             int count = cursor.getCount();
             for (int i = 0; i < count; i++) {
                 results.add(cursor.getItem());