[TextInputLayout] Apply tint when setting start icons

If startIconTint is a plain color, refreshStartIconDrawableState() won't update the tint to the new drawable. To solve the issue and make the logic be consistent, calls applyStartIconTint() when a new icon is set. Resolves #2141 PiperOrigin-RevId: 383632467
material-components · Jul 8, 2021 · 4044183 · 4044183
1 parent 456f135
commit 4044183
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 1 deletion.
diff --git a/lib/java/com/google/android/material/textfield/TextInputLayout.java b/lib/java/com/google/android/material/textfield/TextInputLayout.java
@@ -3107,6 +3107,7 @@ public void setStartIconDrawable(@DrawableRes int resId) {
   public void setStartIconDrawable(@Nullable Drawable startIconDrawable) {
     startIconView.setImageDrawable(startIconDrawable);
     if (startIconDrawable != null) {
+      applyStartIconTint();
       setStartIconVisible(true);
       refreshStartIconDrawableState();
     } else {
@@ -3461,7 +3462,10 @@ public void setEndIconDrawable(@DrawableRes int resId) {
    */
   public void setEndIconDrawable(@Nullable Drawable endIconDrawable) {
     endIconView.setImageDrawable(endIconDrawable);
-    refreshEndIconDrawableState();
+    if (endIconDrawable != null) {
+      applyEndIconTint();
+      refreshEndIconDrawableState();
+    }
   }
 
   /**

diff --git a/tests/javatests/com/google/android/material/testutils/TextInputLayoutActions.java b/tests/javatests/com/google/android/material/testutils/TextInputLayoutActions.java
@@ -20,6 +20,7 @@
 
 import android.content.res.ColorStateList;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -424,6 +425,26 @@ public void perform(UiController uiController, View view) {
     };
   }
 
+  public static ViewAction setStartIconTintMode(final PorterDuff.Mode tintMode) {
+    return new ViewAction() {
+      @Override
+      public Matcher<View> getConstraints() {
+        return isAssignableFrom(TextInputLayout.class);
+      }
+
+      @Override
+      public String getDescription() {
+        return "Set tint mode for the start icon";
+      }
+
+      @Override
+      public void perform(UiController uiController, View view) {
+        TextInputLayout layout = (TextInputLayout) view;
+        layout.setStartIconTintMode(tintMode);
+      }
+    };
+  }
+
   public static ViewAction setStartIconOnClickListener(final OnClickListener onClickListener) {
     return new ViewAction() {
       @Override

diff --git a/tests/javatests/com/google/android/material/textfield/TextInputLayoutIconsTest.java b/tests/javatests/com/google/android/material/textfield/TextInputLayoutIconsTest.java
@@ -45,6 +45,7 @@
 import static com.google.android.material.testutils.TextInputLayoutActions.setStartIconOnClickListener;
 import static com.google.android.material.testutils.TextInputLayoutActions.setStartIconOnLongClickListener;
 import static com.google.android.material.testutils.TextInputLayoutActions.setStartIconTintList;
+import static com.google.android.material.testutils.TextInputLayoutActions.setStartIconTintMode;
 import static com.google.android.material.testutils.TextInputLayoutActions.setSuffixText;
 import static com.google.android.material.testutils.TextInputLayoutActions.setTransformationMethod;
 import static com.google.android.material.testutils.TextInputLayoutMatchers.doesNotShowEndIcon;
@@ -53,6 +54,7 @@
 import static com.google.android.material.testutils.TextInputLayoutMatchers.endIconIsChecked;
 import static com.google.android.material.testutils.TextInputLayoutMatchers.endIconIsNotChecked;
 import static com.google.android.material.testutils.TextInputLayoutMatchers.showsEndIcon;
+import static com.google.common.truth.Truth.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
@@ -62,13 +64,17 @@
 import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
+import android.content.res.ColorStateList;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import androidx.core.graphics.drawable.TintAwareDrawable;
 import android.text.method.PasswordTransformationMethod;
 import android.text.method.TransformationMethod;
 import android.view.KeyEvent;
 import android.widget.EditText;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.ViewAssertion;
 import androidx.test.espresso.matcher.ViewMatchers.Visibility;
 import androidx.test.filters.LargeTest;
@@ -525,6 +531,30 @@ public void  testSetStartIconProgrammatically() {
     assertEquals(contentDesc, textInputLayout.getStartIconContentDescription().toString());
   }
 
+  @Test
+  public void testSetStartIconTint() {
+    final Activity activity = activityTestRule.getActivity();
+    final TextInputLayout textInputLayout = activity.findViewById(R.id.textinput_no_icon);
+    Drawable drawable = new TintCapturedDrawable();
+
+    // Set start icon
+    onView(withId(R.id.textinput_no_icon)).perform(
+        setStartIconTintList(ColorStateList.valueOf(Color.RED)));
+    onView(withId(R.id.textinput_no_icon)).perform(setStartIconTintMode(PorterDuff.Mode.MULTIPLY));
+    onView(withId(R.id.textinput_no_icon)).perform(setStartIcon(drawable));
+
+    // Assert the start icon's tint is set
+    assertNotNull(textInputLayout.getStartIconDrawable());
+    assertThat(textInputLayout.getStartIconDrawable()).isInstanceOf(TintCapturedDrawable.class);
+    assertEquals(
+        Color.RED,
+        ((TintCapturedDrawable) textInputLayout.getStartIconDrawable())
+            .capturedTint.getDefaultColor());
+    assertEquals(
+        PorterDuff.Mode.MULTIPLY,
+        ((TintCapturedDrawable) textInputLayout.getStartIconDrawable()).capturedTintMode);
+  }
+
   @Test
   public void testStartIconDisables() {
     // Disable the start icon
@@ -876,4 +906,23 @@ private static ViewAssertion isPasswordToggledVisible(final boolean isToggledVis
       }
     };
   }
+
+  private static class TintCapturedDrawable extends ColorDrawable implements TintAwareDrawable {
+    ColorStateList capturedTint;
+    PorterDuff.Mode capturedTintMode;
+
+    TintCapturedDrawable() {
+      super(Color.WHITE);
+    }
+
+    @Override
+    public void setTintList(@Nullable ColorStateList tint) {
+      capturedTint = tint;
+    }
+
+    @Override
+    public void setTintMode(@Nullable PorterDuff.Mode tintMode) {
+      capturedTintMode = tintMode;
+    }
+  }
 }