diff options
Diffstat (limited to 'src/com/android/browser/provider/BrowserProvider2.java')
| -rw-r--r-- | src/com/android/browser/provider/BrowserProvider2.java | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java index 47d92de..973f229 100644 --- a/src/com/android/browser/provider/BrowserProvider2.java +++ b/src/com/android/browser/provider/BrowserProvider2.java @@ -64,6 +64,8 @@ public class BrowserProvider2 extends SQLiteContentProvider { static final String DEFAULT_SORT_HISTORY = History.DATE_LAST_VISITED + " DESC"; + static final String DEFAULT_SORT_SEARCHES = Searches.DATE + " DESC"; + static final int BOOKMARKS = 1000; static final int BOOKMARKS_ID = 1001; static final int BOOKMARKS_FOLDER = 1002; @@ -96,12 +98,13 @@ public class BrowserProvider2 extends SQLiteContentProvider { static final HashMap<String, String> ACCOUNTS_PROJECTION_MAP = new HashMap<String, String>(); static final HashMap<String, String> BOOKMARKS_PROJECTION_MAP = new HashMap<String, String>(); - static final HashMap<String, String> OTHER_BOOKMARKS_PROJECTION_MAP = + static final HashMap<String, String> OTHER_BOOKMARKS_PROJECTION_MAP = new HashMap<String, String>(); static final HashMap<String, String> HISTORY_PROJECTION_MAP = new HashMap<String, String>(); static final HashMap<String, String> SYNC_STATE_PROJECTION_MAP = new HashMap<String, String>(); static final HashMap<String, String> IMAGES_PROJECTION_MAP = new HashMap<String, String>(); static final HashMap<String, String> COMBINED_PROJECTION_MAP = new HashMap<String, String>(); + static final HashMap<String, String> SEARCHES_PROJECTION_MAP = new HashMap<String, String>(); static { final UriMatcher matcher = URI_MATCHER; @@ -208,7 +211,13 @@ public class BrowserProvider2 extends SQLiteContentProvider { map.put(Combined.THUMBNAIL, Combined.THUMBNAIL); map.put(Combined.TOUCH_ICON, Combined.TOUCH_ICON); map.put(Combined.USER_ENTERED, Combined.USER_ENTERED); - } + + // Searches + map = SEARCHES_PROJECTION_MAP; + map.put(Searches._ID, Searches._ID); + map.put(Searches.SEARCH, Searches.SEARCH); + map.put(Searches.DATE, Searches.DATE); +} static final String bookmarkOrHistoryColumn(String column) { return "CASE WHEN bookmarks." + column + " IS NOT NULL THEN " + @@ -333,7 +342,7 @@ public class BrowserProvider2 extends SQLiteContentProvider { mSyncHelper.onDatabaseOpened(db); } - + private void createDefaultBookmarks(SQLiteDatabase db) { ContentValues values = new ContentValues(); // TODO figure out how to deal with localization for the defaults @@ -667,6 +676,21 @@ public class BrowserProvider2 extends SQLiteContentProvider { break; } + case SEARCHES_ID: { + selection = DatabaseUtils.concatenateWhere(selection, TABLE_SEARCHES + "._id=?"); + selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs, + new String[] { Long.toString(ContentUris.parseId(uri)) }); + // fall through + } + case SEARCHES: { + if (sortOrder == null) { + sortOrder = DEFAULT_SORT_SEARCHES; + } + qb.setTables(TABLE_SEARCHES); + qb.setProjectionMap(SEARCHES_PROJECTION_MAP); + break; + } + case SYNCSTATE: { return mSyncHelper.query(db, projection, selection, selectionArgs, sortOrder); } |