diff options
| author | John Reck <jreck@google.com> | 2011-05-13 11:16:07 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-05-13 11:16:07 -0700 |
| commit | 006ae18b7b0f3e5d8b6ce80a5cac365ee9b226fd (patch) | |
| tree | e771384fab49c1bacf22da371acf2e1591ab502c /src/com/android/browser | |
| parent | 6d45e134f2fd61e85b219e3fde7de796961bdd67 (diff) | |
| download | packages_apps_Browser-006ae18b7b0f3e5d8b6ce80a5cac365ee9b226fd.zip packages_apps_Browser-006ae18b7b0f3e5d8b6ce80a5cac365ee9b226fd.tar.gz packages_apps_Browser-006ae18b7b0f3e5d8b6ce80a5cac365ee9b226fd.tar.bz2 | |
Remove account adding from getBookmarksUri
Omnibox now searches all accounts
Change-Id: I8b4fbed5efd420f787648340e8c1e9d82d60b24c
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/BookmarkUtils.java | 6 | ||||
| -rw-r--r-- | src/com/android/browser/SuggestionsAdapter.java | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/browser/BookmarkUtils.java b/src/com/android/browser/BookmarkUtils.java index 3aaf5d4..383dc7e 100644 --- a/src/com/android/browser/BookmarkUtils.java +++ b/src/com/android/browser/BookmarkUtils.java @@ -25,7 +25,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Resources; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -42,7 +41,6 @@ import android.os.Message; import android.preference.PreferenceManager; import android.provider.Browser; import android.provider.BrowserContract; -import android.util.DisplayMetrics; public class BookmarkUtils { private final static String LOGTAG = "BookmarkUtils"; @@ -218,10 +216,10 @@ public class BookmarkUtils { } /* package */ static Uri getBookmarksUri(Context context) { - return addAccountInfo(context, - BrowserContract.Bookmarks.CONTENT_URI.buildUpon()).build(); + return BrowserContract.Bookmarks.CONTENT_URI; } + @Deprecated public static Uri.Builder addAccountInfo(Context context, Uri.Builder ub) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); String accountType = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null); diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java index 91ee501..242e170 100644 --- a/src/com/android/browser/SuggestionsAdapter.java +++ b/src/com/android/browser/SuggestionsAdapter.java @@ -472,7 +472,6 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable, Uri.Builder ub = BrowserContract.Combined.CONTENT_URI.buildUpon(); ub.appendQueryParameter(BrowserContract.PARAM_LIMIT, Integer.toString(Math.max(mLinesLandscape, mLinesPortrait))); - BookmarkUtils.addAccountInfo(mContext, ub); mCursor = mContext.getContentResolver().query(ub.build(), COMBINED_PROJECTION, selection, |