commit a96db697796f1d93fa86c3087b97775c75bd7309
author Chris Banes <chrisbanes@google.com> Fri Oct 16 09:47:16 2015 +0100
committer Chris Banes <chrisbanes@google.com> Fri Oct 16 09:47:16 2015 +0100
tree 9f1ff4d782b0ab7c70ffd12e34b9c4f89afd63e7
parent 72643caec38847e8c6a97e79e6cfcbc323d7d885

Make AppCompatImageView.setImageResource(0) work

BUG: 24998069
Change-Id: I8cea71d4afe0e975fed9c113eb9f85a0bed75f18

v7/appcompat/src/android/support/v7/widget/AppCompatImageHelper.java

diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatImageHelper.java b/v7/appcompat/src/android/support/v7/widget/AppCompatImageHelper.java
index bcbca2b..15f3433 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatImageHelper.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatImageHelper.java
@@ -47,8 +47,12 @@
     }
 
     void setImageResource(int resId) {
-        mView.setImageDrawable(mDrawableManager != null
-                ? mDrawableManager.getDrawable(mView.getContext(), resId)
-                : ContextCompat.getDrawable(mView.getContext(), resId));
+        if (resId != 0) {
+            mView.setImageDrawable(mDrawableManager != null
+                    ? mDrawableManager.getDrawable(mView.getContext(), resId)
+                    : ContextCompat.getDrawable(mView.getContext(), resId));
+        } else {
+            mView.setImageDrawable(null);
+        }
     }
 }