commit 1df6df7e33601f1dcd6358a1eea9c34bc6373927
author John Reck <jreck@google.com> Tue Jun 05 11:05:34 2012 -0700
committer John Reck <jreck@google.com> Tue Jun 05 11:05:34 2012 -0700
tree e7ed5f922c95adf2b59d0b118ff6a022b5f70733
parent 3c573ac4dbc0e9a117a9540c410911bab52dffa7

Don't show stale thumbnails

 Bug: 6610952
 We don't null item.thumbnail because we want to recycle the bitmap
 if the item changes, so add a boolean saying whether or not we have
 an actual thumbnail to show to avoid showing stale data

Change-Id: Ibfd485cb7f3ea8991222b8e99704170bf331472b

src/com/android/browser/BrowserBookmarksAdapter.java

diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index afc28ba..5747112 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -93,7 +93,7 @@
             thumb.setBackground(null);
         } else {
             thumb.setScaleType(ScaleType.CENTER_CROP);
-            if (item.thumbnail == null) {
+            if (item.thumbnail == null || !item.has_thumbnail) {
                 thumb.setImageResource(R.drawable.browser_thumbnail);
             } else {
                 thumb.setImageDrawable(item.thumbnail);
@@ -111,6 +111,7 @@
         Bitmap thumbnail = item.thumbnail != null ? item.thumbnail.getBitmap() : null;
         thumbnail = BrowserBookmarksPage.getBitmap(c,
                 BookmarksLoader.COLUMN_INDEX_THUMBNAIL, thumbnail);
+        item.has_thumbnail = thumbnail != null;
         if (thumbnail != null
                 && (item.thumbnail == null || item.thumbnail.getBitmap() != thumbnail)) {
             item.thumbnail = new BitmapDrawable(mContext.getResources(), thumbnail);

src/com/android/browser/BrowserBookmarksAdapterItem.java

diff --git a/src/com/android/browser/BrowserBookmarksAdapterItem.java b/src/com/android/browser/BrowserBookmarksAdapterItem.java
index 64b1ca2..6b99578 100644
--- a/src/com/android/browser/BrowserBookmarksAdapterItem.java
+++ b/src/com/android/browser/BrowserBookmarksAdapterItem.java
@@ -21,5 +21,6 @@
     public String url;
     public CharSequence title;
     public BitmapDrawable thumbnail;
+    public boolean has_thumbnail;
     public boolean is_folder;
 }