diff options
Diffstat (limited to 'src/com/android/browser/BrowserProvider.java')
| -rw-r--r-- | src/com/android/browser/BrowserProvider.java | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/com/android/browser/BrowserProvider.java b/src/com/android/browser/BrowserProvider.java index d2f4a0a..8ed889e 100644 --- a/src/com/android/browser/BrowserProvider.java +++ b/src/com/android/browser/BrowserProvider.java @@ -65,8 +65,9 @@ public class BrowserProvider extends ContentProvider { "_id", "url", "title", "bookmark" }; private static final String SUGGEST_SELECTION = - "url LIKE ? OR url LIKE ? OR url LIKE ? OR url LIKE ?"; - private String[] SUGGEST_ARGS = new String[4]; + "url LIKE ? OR url LIKE ? OR url LIKE ? OR url LIKE ?" + + " OR title LIKE ?"; + private String[] SUGGEST_ARGS = new String[5]; // shared suggestion array index, make sure to match COLUMNS private static final int SUGGEST_COLUMN_INTENT_ACTION_ID = 1; @@ -92,6 +93,8 @@ public class BrowserProvider extends ContentProvider { private static final int MAX_SUGGESTION_SHORT_ENTRIES = 3; private static final int MAX_SUGGESTION_LONG_ENTRIES = 6; + private static final String MAX_SUGGESTION_LONG_ENTRIES_STRING = + Integer.valueOf(MAX_SUGGESTION_LONG_ENTRIES).toString(); // make sure that these match the index of TABLE_NAMES private static final int URI_MATCH_BOOKMARKS = 0; @@ -407,22 +410,22 @@ public class BrowserProvider extends ContentProvider { case SUGGEST_COLUMN_ICON_1_ID: if (mHistoryCount > mPos) { if (mHistoryCursor.getInt(3) == 1) { - return new Integer( + return Integer.valueOf( R.drawable.ic_search_category_bookmark) .toString(); } else { - return new Integer( + return Integer.valueOf( R.drawable.ic_search_category_history) .toString(); } } else { - return new Integer( + return Integer.valueOf( R.drawable.ic_search_category_suggest) .toString(); } case SUGGEST_COLUMN_ICON_2_ID: - return new String("0"); + return "0"; case SUGGEST_COLUMN_QUERY_ID: if (mHistoryCount > mPos) { @@ -573,7 +576,8 @@ public class BrowserProvider extends ContentProvider { myArgs = null; } else { String like = selectionArgs[0] + "%"; - if (selectionArgs[0].startsWith("http")) { + if (selectionArgs[0].startsWith("http") + || selectionArgs[0].startsWith("file")) { myArgs = new String[1]; myArgs[0] = like; suggestSelection = selection; @@ -582,6 +586,8 @@ public class BrowserProvider extends ContentProvider { SUGGEST_ARGS[1] = "http://www." + like; SUGGEST_ARGS[2] = "https://" + like; SUGGEST_ARGS[3] = "https://www." + like; + // To match against titles. + SUGGEST_ARGS[4] = like; myArgs = SUGGEST_ARGS; suggestSelection = SUGGEST_SELECTION; } @@ -589,8 +595,7 @@ public class BrowserProvider extends ContentProvider { Cursor c = db.query(TABLE_NAMES[URI_MATCH_BOOKMARKS], SUGGEST_PROJECTION, suggestSelection, myArgs, null, null, - ORDER_BY, - (new Integer(MAX_SUGGESTION_LONG_ENTRIES)).toString()); + ORDER_BY, MAX_SUGGESTION_LONG_ENTRIES_STRING); if (match == URI_MATCH_BOOKMARKS_SUGGEST || Regex.WEB_URL_PATTERN.matcher(selectionArgs[0]).matches()) { |