commit aad56dda40dca1d9b6418ef48f12257101b2c7b2
author Ficus Kirkpatrick <ficus@android.com> Sun Nov 10 08:30:57 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 10 08:30:57 2013 -0800
tree f584de3bd3a6cc4c7f0ce5c89ca245436945141e
parent a6ddf34f63cfd2ef7be20dae45d515c2ffd5ae0a
parent d4da50f120b998a968944bc819fa3763262887f2

am d4da50f1: Merge "Fix default image not displaying prior to load"

* commit 'd4da50f120b998a968944bc819fa3763262887f2':
  Fix default image not displaying prior to load

src/com/android/volley/toolbox/NetworkImageView.java

diff --git a/src/com/android/volley/toolbox/NetworkImageView.java b/src/com/android/volley/toolbox/NetworkImageView.java
index 74c9159..6fe857f 100644
--- a/src/com/android/volley/toolbox/NetworkImageView.java
+++ b/src/com/android/volley/toolbox/NetworkImageView.java
@@ -120,7 +120,7 @@
                 mImageContainer.cancelRequest();
                 mImageContainer = null;
             }
-            setImageBitmap(null);
+            setDefaultImageOrNull();
             return;
         }
 
@@ -132,7 +132,7 @@
             } else {
                 // if there is a pre-existing request, cancel it if it's fetching a different URL.
                 mImageContainer.cancelRequest();
-                setImageBitmap(null);
+                setDefaultImageOrNull();
             }
         }
 
@@ -175,6 +175,15 @@
         mImageContainer = newContainer;
     }
 
+    private void setDefaultImageOrNull() {
+        if(mDefaultImageId != 0) {
+            setImageResource(mDefaultImageId);
+        }
+        else {
+            setImageBitmap(null);
+        }
+    }
+
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);