diff options
| author | John Reck <jreck@google.com> | 2010-12-10 11:59:22 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-10 11:59:22 -0800 |
| commit | e3e90c23337166065b1f68be7d82434df89b0691 (patch) | |
| tree | 101b320d2430f1e463537d32f88738472bd17d78 /src/com/android | |
| parent | 2b6bed9bcaee374c1e915bfa0bf76d4187f2ef4b (diff) | |
| parent | 3dff1cedc22620ab56fbd39f3703f19bb552ca34 (diff) | |
| download | packages_apps_Browser-e3e90c23337166065b1f68be7d82434df89b0691.zip packages_apps_Browser-e3e90c23337166065b1f68be7d82434df89b0691.tar.gz packages_apps_Browser-e3e90c23337166065b1f68be7d82434df89b0691.tar.bz2 | |
Merge "Makes CombinedCursor sync aware"
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/browser/BookmarkUtils.java | 17 | ||||
| -rw-r--r-- | src/com/android/browser/SuggestionsAdapter.java | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/com/android/browser/BookmarkUtils.java b/src/com/android/browser/BookmarkUtils.java index c72cbd1..58622ce 100644 --- a/src/com/android/browser/BookmarkUtils.java +++ b/src/com/android/browser/BookmarkUtils.java @@ -170,16 +170,21 @@ class BookmarkUtils { } /* package */ static Uri getBookmarksUri(Context context) { + return addAccountInfo(context, + BrowserContract.Bookmarks.CONTENT_URI.buildUpon()).build(); + } + + /* package */ static Uri.Builder addAccountInfo(Context context, Uri.Builder ub) { Uri uri = BrowserContract.Bookmarks.CONTENT_URI; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); String accountType = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null); String accountName = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, null); if (!TextUtils.isEmpty(accountName) && !TextUtils.isEmpty(accountType)) { - uri = uri.buildUpon() - .appendQueryParameter(BrowserContract.Bookmarks.PARAM_ACCOUNT_NAME, accountName) - .appendQueryParameter(BrowserContract.Bookmarks.PARAM_ACCOUNT_TYPE, accountType) - .build(); + ub.appendQueryParameter( + BrowserContract.Bookmarks.PARAM_ACCOUNT_NAME,accountName); + ub.appendQueryParameter( + BrowserContract.Bookmarks.PARAM_ACCOUNT_TYPE, accountType); } - return uri; + return ub; } -}; +} diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java index 8c06353..6473dfd 100644 --- a/src/com/android/browser/SuggestionsAdapter.java +++ b/src/com/android/browser/SuggestionsAdapter.java @@ -498,10 +498,12 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable, OnCli Uri.Builder ub = BrowserContract.Combined.CONTENT_URI.buildUpon(); ub.appendQueryParameter(BrowserContract.PARAM_LIMIT, Integer.toString(mLinesPortrait)); + BookmarkUtils.addAccountInfo(mContext, ub); mCursor = mContext.getContentResolver().query(ub.build(), COMBINED_PROJECTION, selection, (constraint != null) ? args : null, + BrowserContract.Combined.IS_BOOKMARK + " DESC, " + BrowserContract.Combined.VISITS + " DESC, " + BrowserContract.Combined.DATE_LAST_VISITED + " DESC"); if (mCursor != null) { |