/*
 * Copyright (C) 2015 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.support.v7.widget;

import android.support.v4.content.ContextCompat;
import android.support.v7.internal.widget.AppCompatDrawableManager;
import android.support.v7.internal.widget.TintTypedArray;
import android.util.AttributeSet;
import android.widget.ImageView;

class AppCompatImageHelper {

    private static final int[] VIEW_ATTRS = {android.R.attr.src};

    private final ImageView mView;
    private final AppCompatDrawableManager mDrawableManager;

    AppCompatImageHelper(ImageView view, AppCompatDrawableManager drawableManager) {
        mView = view;
        mDrawableManager = drawableManager;
    }

    void loadFromAttributes(AttributeSet attrs, int defStyleAttr) {
        TintTypedArray a = TintTypedArray.obtainStyledAttributes(mView.getContext(), attrs,
                VIEW_ATTRS, defStyleAttr, 0);
        try {
            if (a.hasValue(0)) {
                mView.setImageDrawable(a.getDrawable(0));
            }
        } finally {
            a.recycle();
        }
    }

    void setImageResource(int resId) {
        mView.setImageDrawable(mDrawableManager != null
                ? mDrawableManager.getDrawable(mView.getContext(), resId)
                : ContextCompat.getDrawable(mView.getContext(), resId));
    }
}

@@ -1667,24 +1667,54 @@
 nt resId) %7B%0A
+        if (resId != 0) %7B%0A    
         mVie
@@ -1757,16 +1757,20 @@
 != null%0A
+    
         
@@ -1851,16 +1851,20 @@
         
+    
 : Contex
@@ -1908,20 +1908,89 @@
 ), resId));%0A
+        %7D else %7B%0A            mView.setImageDrawable(null);%0A        %7D%0A
     %7D%0A%7D%0A

Make AppCompatImageView.setImageResource(0) work