diff options
author | Ben Murdoch <benm@google.com> | 2010-11-25 15:27:20 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-11-26 10:10:33 +0000 |
commit | b4b87c66e241a7bda0c6c571a82d461775032438 (patch) | |
tree | e125ac89fcdbf6da5bd27dda43e95f77aa3fb2c8 /src/com/android/browser/WebsiteSettingsActivity.java | |
parent | ef67165a877b1cd17d4afc6e2e17caa97fc399f2 (diff) | |
download | packages_apps_Browser-b4b87c66e241a7bda0c6c571a82d461775032438.zip packages_apps_Browser-b4b87c66e241a7bda0c6c571a82d461775032438.tar.gz packages_apps_Browser-b4b87c66e241a7bda0c6c571a82d461775032438.tar.bz2 |
Fix website settings favicon loading.
Update WebsiteSettingsActivity to look up icons from the new
bookmark database.
Change-Id: Icdd788dba2bce397d5ff2f9c7d7a155c7d270a26
Diffstat (limited to 'src/com/android/browser/WebsiteSettingsActivity.java')
-rw-r--r-- | src/com/android/browser/WebsiteSettingsActivity.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/browser/WebsiteSettingsActivity.java b/src/com/android/browser/WebsiteSettingsActivity.java index 1e27092..bd57c91 100644 --- a/src/com/android/browser/WebsiteSettingsActivity.java +++ b/src/com/android/browser/WebsiteSettingsActivity.java @@ -25,7 +25,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Bundle; -import android.provider.Browser; +import android.provider.BrowserContract.Bookmarks; import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -262,15 +262,15 @@ public class WebsiteSettingsActivity extends ListActivity { // Check the bookmark DB. If we have data for a host used by any of // our origins, use it to set their title and favicon - Cursor c = getContext().getContentResolver().query(Browser.BOOKMARKS_URI, - new String[] { Browser.BookmarkColumns.URL, Browser.BookmarkColumns.TITLE, - Browser.BookmarkColumns.FAVICON }, "bookmark = 1", null, null); + Cursor c = getContext().getContentResolver().query(Bookmarks.CONTENT_URI, + new String[] { Bookmarks.URL, Bookmarks.TITLE, Bookmarks.FAVICON }, + Bookmarks.IS_FOLDER + " == 0", null, null); if (c != null) { if (c.moveToFirst()) { - int urlIndex = c.getColumnIndex(Browser.BookmarkColumns.URL); - int titleIndex = c.getColumnIndex(Browser.BookmarkColumns.TITLE); - int faviconIndex = c.getColumnIndex(Browser.BookmarkColumns.FAVICON); + int urlIndex = c.getColumnIndex(Bookmarks.URL); + int titleIndex = c.getColumnIndex(Bookmarks.TITLE); + int faviconIndex = c.getColumnIndex(Bookmarks.FAVICON); do { String url = c.getString(urlIndex); String host = Uri.parse(url).getHost(); |