From 8f0076b720c9ee1e9ef9d29910c261634fd5fb25 Mon Sep 17 00:00:00 2001 From: Patrick Scott Date: Thu, 17 Sep 2009 13:51:30 -0400 Subject: Display favicons for history items. Use the data from the java database before talking to the native database. The bookmarks database may contain favicons that the native database does not have a mapping for. Used the native icon database for recent history items since those are not stored in the java db. Request the icons each time the activity is created since the url->bitmap mapping is a global. --- src/com/android/browser/BrowserBookmarksAdapter.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/com/android/browser/BrowserBookmarksAdapter.java') diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java index a7fa19c34..e2c09cfb8 100644 --- a/src/com/android/browser/BrowserBookmarksAdapter.java +++ b/src/com/android/browser/BrowserBookmarksAdapter.java @@ -383,11 +383,17 @@ class BrowserBookmarksAdapter extends BaseAdapter { /* package */ void populateBookmarkItem(BookmarkItem b, int position) { mCursor.moveToPosition(position - mExtraOffset); - b.setUrl(mCursor.getString(Browser.HISTORY_PROJECTION_URL_INDEX)); + String url = mCursor.getString(Browser.HISTORY_PROJECTION_URL_INDEX); + b.setUrl(url); b.setName(mCursor.getString(Browser.HISTORY_PROJECTION_TITLE_INDEX)); byte[] data = mCursor.getBlob(Browser.HISTORY_PROJECTION_FAVICON_INDEX); - Bitmap bitmap = (null == data) ? null : - BitmapFactory.decodeByteArray(data, 0, data.length); + Bitmap bitmap = null; + if (data == null) { + bitmap = CombinedBookmarkHistoryActivity.getIconListenerSet() + .getFavicon(url); + } else { + bitmap = BitmapFactory.decodeByteArray(data, 0, data.length); + } b.setFavicon(bitmap); } @@ -544,7 +550,8 @@ class BrowserBookmarksAdapter extends BaseAdapter { if (data != null) { b.setFavicon(BitmapFactory.decodeByteArray(data, 0, data.length)); } else { - b.setFavicon(null); + b.setFavicon(CombinedBookmarkHistoryActivity.getIconListenerSet() + .getFavicon(url)); } } -- cgit v1.2.3