diff options
| author | John Reck <jreck@google.com> | 2010-12-10 11:13:57 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-12-10 11:22:52 -0800 |
| commit | 3dff1cedc22620ab56fbd39f3703f19bb552ca34 (patch) | |
| tree | 9debf3f75d5884cfbaa7134141b4b551ea5f50a9 /src/com | |
| parent | f9e493e549a0cbeb2cdad4cf6dc9a9e420c3b17b (diff) | |
| download | packages_apps_Browser-3dff1cedc22620ab56fbd39f3703f19bb552ca34.zip packages_apps_Browser-3dff1cedc22620ab56fbd39f3703f19bb552ca34.tar.gz packages_apps_Browser-3dff1cedc22620ab56fbd39f3703f19bb552ca34.tar.bz2 | |
Makes CombinedCursor sync aware
Bug: 3192765
SuggestionsAdapter.CombinedCursor was not setting account parameters
Change-Id: I57c341383970105fde8cbb2a6cde3831125cef1b
Diffstat (limited to 'src/com')
| -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) { |