Fix default image not displaying prior to load

Previously, if a default image was set, it would not be displayed
until a network load had begun. In some use cases where the load
would not be started until some arbitrary time in the future, this
would leave an empty image view visible to the user. This patch
checks to see if there is a default image set, and if so, uses that
to clear the view, so prior to loading, the defualt image will be
shown.

Change-Id: I6fcee408d95d708676d68f3f0bc7222e56570f39

1 files changed, 11 insertions, 2 deletions

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 @@ public class NetworkImageView extends ImageView {
                 mImageContainer.cancelRequest();
                 mImageContainer = null;
             }
-            setImageBitmap(null);
+            setDefaultImageOrNull();
             return;
         }
 
@@ -132,7 +132,7 @@ public class NetworkImageView extends ImageView {
             } 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 @@ public class NetworkImageView extends ImageView {
         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);