[Chip] Fix close icon tint

pubiqq · paulfthomas · commit 09e77fa14a02 · 2025-06-27T22:04:39.000Z
Resolves #4824 - 050b1f1 by pubiqq <serj.ese@gmail.com> PiperOrigin-RevId: 776656483
diff --git a/lib/java/com/google/android/material/chip/ChipDrawable.java b/lib/java/com/google/android/material/chip/ChipDrawable.java
@@ -1326,10 +1326,10 @@ private void applyChildDrawable(@Nullable Drawable drawable) {
     drawable.setVisible(isVisible(), false);
 
     if (drawable == closeIcon) {
+      drawable.setTintList(closeIconTint); // call before `setState` to prevent state reset
       if (drawable.isStateful()) {
         drawable.setState(getCloseIconState());
       }
-      drawable.setTintList(closeIconTint);
       return;
     }
     if (drawable == chipIcon && hasChipIconTint) {

Original file line number	Diff line number	Diff line change
`@@ -1326,10 +1326,10 @@ private void applyChildDrawable(@Nullable Drawable drawable) {`
`1326`	`1326`	`drawable.setVisible(isVisible(), false);`
`1327`	`1327`
`1328`	`1328`	`if (drawable == closeIcon) {`
	`1329`	+ drawable.setTintList(closeIconTint); // call before `setState` to prevent state reset
`1329`	`1330`	`if (drawable.isStateful()) {`
`1330`	`1331`	`drawable.setState(getCloseIconState());`
`1331`	`1332`	`}`
`1332`		`- drawable.setTintList(closeIconTint);`
`1333`	`1333`	`return;`
`1334`	`1334`	`}`
`1335`	`1335`	`if (drawable == chipIcon && hasChipIconTint) {`