commit 99f9d53bef367804a1df2145454663310f706d0f
author Dmitri Plotnikov <dplotnikov@google.com> Fri Dec 17 14:58:51 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Fri Dec 17 14:58:51 2010 -0800
tree 36b62a51a12c26ffa4865077bda938408342df07
parent 060b45312d0a6fea2dfa7100730ae8baa728b42d

Fixing photo flicker during sync

Change-Id: I500e363c58a2a5ab73a1dbe46281c86070ed4142

src/com/android/contacts/list/ContactPhotoLoader.java

diff --git a/src/com/android/contacts/list/ContactPhotoLoader.java b/src/com/android/contacts/list/ContactPhotoLoader.java
index e0d357d..795366f 100644
--- a/src/com/android/contacts/list/ContactPhotoLoader.java
+++ b/src/com/android/contacts/list/ContactPhotoLoader.java
@@ -206,13 +206,13 @@
                 holder.state = BitmapHolder.NEEDED;
             }
 
-            if (loaded || loadedNeedsReload) {
-                // Null bitmap reference means that database contains no bytes for the photo
-                if (holder.bitmapRef == null) {
-                    view.setImageResource(mDefaultResourceId);
-                    return loaded;
-                }
+            // Null bitmap reference means that database contains no bytes for the photo
+            if ((loaded || loadedNeedsReload) && holder.bitmapRef == null) {
+                view.setImageResource(mDefaultResourceId);
+                return loaded;
+            }
 
+            if (holder.bitmapRef != null) {
                 Bitmap bitmap = holder.bitmapRef.get();
                 if (bitmap != null) {
                     view.setImageBitmap(bitmap);