commit 6a6d510c013a078aea890f91149022b3f57a0e51
author Leon Scroggins III <scroggo@google.com> Fri Sep 17 14:31:45 2010 -0400
committer Leon Scroggins III <scroggo@google.com> Fri Sep 17 14:31:45 2010 -0400
tree 8b2e6f8f994e1fe82d1ba843177d13fb5be6cd70
parent 18a1e1d1df382e1769609059a64a838544f7e8eb
parent fc2c6f1da5e614c7740be376817cebc8877db143

resolved conflicts for merge of fc2c6f1d to master

Change-Id: I708443617cf602a957a90a5770deab77c47c776f

src/com/android/browser/BrowserProvider.java

diff --git a/src/com/android/browser/BrowserProvider.java b/src/com/android/browser/BrowserProvider.java
index 1320e83..358fd35 100644
--- a/src/com/android/browser/BrowserProvider.java
+++ b/src/com/android/browser/BrowserProvider.java
@@ -890,8 +890,7 @@
         } else {
             // get search suggestions if there is still space in the list
             if (myArgs != null && myArgs.length > 1
-                    && mSettings.getShowSearchSuggestions()
-                    && c.getCount() < (MAX_SUGGEST_SHORT_SMALL - 1)) {
+                    && c.getCount() < (MAX_SUGGESTION_SHORT_ENTRIES - 1)) {
                 SearchEngine searchEngine = mSettings.getSearchEngine();
                 if (searchEngine != null && searchEngine.supportsSuggestions()) {
                     Cursor sc = searchEngine.getSuggestions(getContext(), selectionArgs[0]);