Support tinted chip icons.

 Resolves #767

PiperOrigin-RevId: 283387208
(cherry picked from commit d25fa92)

Author: wcshi

lib/java/com/google/android/material/chip/ChipDrawable.java

@@ -182,6 +182,7 @@ public class ChipDrawable extends MaterialShapeDrawable
   @Nullable private Drawable chipIcon;
   @Nullable private ColorStateList chipIconTint;
   private float chipIconSize;
+  private boolean hasChipIconTint;
 
   // Close icon
   private boolean closeIconVisible;
@@ -378,7 +379,10 @@ private void loadFromAttributes(
       setChipIconVisible(a.getBoolean(R.styleable.Chip_chipIconEnabled, false));
     }
     setChipIcon(MaterialResources.getDrawable(context, a, R.styleable.Chip_chipIcon));
-    setChipIconTint(MaterialResources.getColorStateList(context, a, R.styleable.Chip_chipIconTint));
+    if (a.hasValue(R.styleable.Chip_chipIconTint)) {
+      setChipIconTint(
+          MaterialResources.getColorStateList(context, a, R.styleable.Chip_chipIconTint));
+    }
     setChipIconSize(a.getDimension(R.styleable.Chip_chipIconSize, 0f));
 
     setCloseIconVisible(a.getBoolean(R.styleable.Chip_closeIconVisible, false));
@@ -1265,25 +1269,26 @@ private void unapplyChildDrawable(@Nullable Drawable drawable) {
 
   /** Note: This should not change the size of the drawable. */
   private void applyChildDrawable(@Nullable Drawable drawable) {
-    if (drawable != null) {
-      drawable.setCallback(this);
-      DrawableCompat.setLayoutDirection(drawable, DrawableCompat.getLayoutDirection(this));
-      drawable.setLevel(getLevel());
-      drawable.setVisible(isVisible(), false);
-
-      if (drawable == closeIcon) {
-        if (drawable.isStateful()) {
-          drawable.setState(getCloseIconState());
-        }
-        DrawableCompat.setTintList(drawable, closeIconTint);
-      } else {
-        if (drawable.isStateful()) {
-          drawable.setState(getState());
-        }
-        if (drawable == chipIcon) {
-          DrawableCompat.setTintList(chipIcon, chipIconTint);
-        }
+    if (drawable == null) {
+      return;
+    }
+    drawable.setCallback(this);
+    DrawableCompat.setLayoutDirection(drawable, DrawableCompat.getLayoutDirection(this));
+    drawable.setLevel(getLevel());
+    drawable.setVisible(isVisible(), false);
+
+    if (drawable == closeIcon) {
+      if (drawable.isStateful()) {
+        drawable.setState(getCloseIconState());
       }
+      DrawableCompat.setTintList(drawable, closeIconTint);
+      return;
+    }
+    if (drawable.isStateful()) {
+      drawable.setState(getState());
+    }
+    if (drawable == chipIcon && hasChipIconTint) {
+      DrawableCompat.setTintList(chipIcon, chipIconTint);
     }
   }
 
@@ -1684,9 +1689,9 @@ public void setChipIconTintResource(@ColorRes int id) {
    * @attr ref com.google.android.material.R.styleable#Chip_chipIconTint
    */
   public void setChipIconTint(@Nullable ColorStateList chipIconTint) {
+    hasChipIconTint = true;
     if (this.chipIconTint != chipIconTint) {
       this.chipIconTint = chipIconTint;
-
       if (showsChipIcon()) {
         DrawableCompat.setTintList(chipIcon, chipIconTint);
       }