[CleanUp][TextField] Move end icon and content description logic to the layout class

PiperOrigin-RevId: 448036109

Author: drchen

lib/java/com/google/android/material/textfield/ClearTextEndIconDelegate.java

@@ -26,7 +26,6 @@
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.widget.EditText;
-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.animation.AnimationUtils;
@@ -59,16 +58,12 @@ class ClearTextEndIconDelegate extends EndIconDelegate {
   private AnimatorSet iconInAnim;
   private ValueAnimator iconOutAnim;
 
-  ClearTextEndIconDelegate(@NonNull EndCompoundLayout endLayout, @DrawableRes int customEndIcon) {
-    super(endLayout, customEndIcon);
+  ClearTextEndIconDelegate(@NonNull EndCompoundLayout endLayout) {
+    super(endLayout);
   }
 
   @Override
   void setUp() {
-    endLayout.setEndIconDrawable(
-        customEndIcon == 0 ? R.drawable.mtrl_ic_cancel : customEndIcon);
-    endLayout.setEndIconContentDescription(
-        endLayout.getResources().getText(R.string.clear_text_end_icon_content_description));
     endLayout.setEndIconCheckable(false);
     initAnimators();
   }
@@ -82,6 +77,16 @@ void tearDown() {
     }
   }
 
+  @Override
+  int getIconDrawableResId() {
+    return R.drawable.mtrl_ic_cancel;
+  }
+
+  @Override
+  int getIconContentDescriptionResId() {
+    return R.string.clear_text_end_icon_content_description;
+  }
+
   @Override
   void onSuffixVisibilityChanged(boolean visible) {
     if (endLayout.getSuffixText() == null) {

lib/java/com/google/android/material/textfield/CustomEndIconDelegate.java

@@ -16,7 +16,6 @@
 
 package com.google.android.material.textfield;
 
-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 
 /**
@@ -28,14 +27,12 @@
  * TextInputLayout#setEndIconMode(int)}.
  */
 class CustomEndIconDelegate extends EndIconDelegate {
-
-  CustomEndIconDelegate(@NonNull EndCompoundLayout endLayout, @DrawableRes int customEndIcon) {
-    super(endLayout, customEndIcon);
+  CustomEndIconDelegate(@NonNull EndCompoundLayout endLayout) {
+    super(endLayout);
   }
 
   @Override
   void setUp() {
-    endLayout.setEndIconDrawable(customEndIcon);
     endLayout.setEndIconOnLongClickListener(null);
   }
 }

lib/java/com/google/android/material/textfield/DropdownMenuEndIconDelegate.java

@@ -41,7 +41,6 @@
 import android.widget.EditText;
 import android.widget.Spinner;
 import androidx.annotation.ChecksSdkIntAtLeast;
-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
@@ -78,22 +77,12 @@ class DropdownMenuEndIconDelegate extends EndIconDelegate {
   private ValueAnimator fadeOutAnim;
   private ValueAnimator fadeInAnim;
 
-  DropdownMenuEndIconDelegate(
-      @NonNull EndCompoundLayout endLayout, @DrawableRes int customEndIcon) {
-    super(endLayout, customEndIcon);
+  DropdownMenuEndIconDelegate(@NonNull EndCompoundLayout endLayout) {
+    super(endLayout);
   }
 
   @Override
   void setUp() {
-    // For lollipop+, the arrow icon changes orientation based on dropdown popup, otherwise it
-    // always points down.
-    int drawableResId =
-        customEndIcon == 0
-            ? (IS_LOLLIPOP ? R.drawable.mtrl_dropdown_arrow : R.drawable.mtrl_ic_arrow_drop_down)
-            : customEndIcon;
-    endLayout.setEndIconDrawable(drawableResId);
-    endLayout.setEndIconContentDescription(
-        endLayout.getResources().getText(R.string.exposed_dropdown_menu_content_description));
     initAnimators();
     accessibilityManager =
         (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
@@ -121,6 +110,18 @@ void tearDown() {
     }
   }
 
+  @Override
+  int getIconDrawableResId() {
+    // For lollipop+, the arrow icon changes orientation based on dropdown popup, otherwise it
+    // always points down.
+    return IS_LOLLIPOP ? R.drawable.mtrl_dropdown_arrow : R.drawable.mtrl_ic_arrow_drop_down;
+  }
+
+  @Override
+  int getIconContentDescriptionResId() {
+    return R.string.exposed_dropdown_menu_content_description;
+  }
+
   @Override
   boolean shouldTintIconOnError() {
     return true;

lib/java/com/google/android/material/textfield/EndCompoundLayout.java

@@ -330,6 +330,8 @@ void setEndIconMode(@EndIconMode int endIconMode) {
     dispatchOnEndIconChanged(previousEndIconMode);
     setEndIconVisible(endIconMode != END_ICON_NONE);
     EndIconDelegate delegate = getEndIconDelegate();
+    setEndIconDrawable(getIconResId(delegate));
+    setEndIconContentDescription(delegate.getIconContentDescriptionResId());
     if (delegate.isBoxBackgroundModeSupported(textInputLayout.getBoxBackgroundMode())) {
       delegate.setUp();
     } else {
@@ -347,6 +349,11 @@ void setEndIconMode(@EndIconMode int endIconMode) {
     applyIconTint(textInputLayout, endIconView, endIconTintList, endIconTintMode);
   }
 
+  private int getIconResId(EndIconDelegate delegate) {
+    int customIconResId = endIconDelegates.customEndIconDrawableId;
+    return customIconResId == 0 ? delegate.getIconDrawableResId() : customIconResId;
+  }
+
   void setEndIconOnClickListener(@Nullable OnClickListener endIconOnClickListener) {
     setIconOnClickListener(endIconView, endIconOnClickListener, endIconOnLongClickListener);
   }
@@ -678,12 +685,12 @@ private static class EndIconDelegates {
     private final SparseArray<EndIconDelegate> delegates = new SparseArray<>();
 
     private final EndCompoundLayout endLayout;
-    private final int endIconDrawableId;
+    private final int customEndIconDrawableId;
     private final int passwordIconDrawableId;
 
     EndIconDelegates(EndCompoundLayout endLayout, TintTypedArray a) {
       this.endLayout = endLayout;
-      endIconDrawableId = a.getResourceId(R.styleable.TextInputLayout_endIconDrawable, 0);
+      customEndIconDrawableId = a.getResourceId(R.styleable.TextInputLayout_endIconDrawable, 0);
       passwordIconDrawableId =
           a.getResourceId(R.styleable.TextInputLayout_passwordToggleDrawable, 0);
     }
@@ -700,14 +707,13 @@ EndIconDelegate get(@EndIconMode int endIconMode) {
     private EndIconDelegate create(@EndIconMode int endIconMode) {
       switch (endIconMode) {
         case END_ICON_PASSWORD_TOGGLE:
-          return new PasswordToggleEndIconDelegate(
-              endLayout, endIconDrawableId == 0 ? passwordIconDrawableId : endIconDrawableId);
+          return new PasswordToggleEndIconDelegate(endLayout, passwordIconDrawableId);
         case END_ICON_CLEAR_TEXT:
-          return new ClearTextEndIconDelegate(endLayout, endIconDrawableId);
+          return new ClearTextEndIconDelegate(endLayout);
         case END_ICON_DROPDOWN_MENU:
-          return new DropdownMenuEndIconDelegate(endLayout, endIconDrawableId);
+          return new DropdownMenuEndIconDelegate(endLayout);
         case END_ICON_CUSTOM:
-          return new CustomEndIconDelegate(endLayout, endIconDrawableId);
+          return new CustomEndIconDelegate(endLayout);
         case END_ICON_NONE:
           return new NoEndIconDelegate(endLayout);
         default:

lib/java/com/google/android/material/textfield/EndIconDelegate.java

@@ -26,6 +26,7 @@
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import com.google.android.material.internal.CheckableImageButton;
 import com.google.android.material.textfield.TextInputLayout.BoxBackgroundMode;
@@ -43,23 +44,32 @@ abstract class EndIconDelegate {
   final Context context;
   final CheckableImageButton endIconView;
 
-  @DrawableRes
-  final int customEndIcon;
-
-  EndIconDelegate(@NonNull EndCompoundLayout endLayout, @DrawableRes int customEndIcon) {
+  EndIconDelegate(@NonNull EndCompoundLayout endLayout) {
     this.textInputLayout = endLayout.textInputLayout;
     this.endLayout = endLayout;
     this.context = endLayout.getContext();
     this.endIconView = endLayout.getEndIconView();
-    this.customEndIcon = customEndIcon;
   }
 
   /** Called when the associated end icon mode is set. */
-  abstract void setUp();
+  void setUp() {}
+  ;
 
   /** Called when the associated end icon mode is unset. */
   void tearDown() {}
 
+  /** Returns the icon resource ID that should be used. */
+  @DrawableRes
+  int getIconDrawableResId() {
+    return 0;
+  }
+
+  /** Returns the string resource ID that should be used as the content description. */
+  @StringRes
+  int getIconContentDescriptionResId() {
+    return 0;
+  }
+
   /**
    * Whether the end icon should be tinted with the error color when the {@link TextInputLayout} is
    * in error mode.
@@ -138,4 +148,3 @@ void onInitializeAccessibilityNodeInfo(View host, @NonNull AccessibilityNodeInfo
    */
   void onPopulateAccessibilityEvent(View host, @NonNull AccessibilityEvent event) {}
 }
-

lib/java/com/google/android/material/textfield/NoEndIconDelegate.java

@@ -23,12 +23,6 @@
  */
 class NoEndIconDelegate extends EndIconDelegate {
   NoEndIconDelegate(@NonNull EndCompoundLayout endLayout) {
-    super(endLayout, 0);
-  }
-
-  @Override
-  void setUp() {
-    endLayout.setEndIconDrawable(null);
-    endLayout.setEndIconContentDescription(null);
+    super(endLayout);
   }
 }

lib/java/com/google/android/material/textfield/PasswordToggleEndIconDelegate.java

@@ -25,9 +25,11 @@
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 
 /** Default initialization of the password toggle end icon. */
 class PasswordToggleEndIconDelegate extends EndIconDelegate {
+  private int iconResId = R.drawable.design_password_eye;
 
   @Nullable
   private EditText editText;
@@ -52,16 +54,15 @@ class PasswordToggleEndIconDelegate extends EndIconDelegate {
   };
 
   PasswordToggleEndIconDelegate(
-      @NonNull EndCompoundLayout endLayout, @DrawableRes int customEndIcon) {
-    super(endLayout, customEndIcon);
+      @NonNull EndCompoundLayout endLayout, @DrawableRes int overrideIconResId) {
+    super(endLayout);
+    if (overrideIconResId != 0) {
+      iconResId = overrideIconResId;
+    }
   }
 
   @Override
   void setUp() {
-    endLayout.setEndIconDrawable(
-        customEndIcon == 0 ? R.drawable.design_password_eye : customEndIcon);
-    endLayout.setEndIconContentDescription(
-        endLayout.getResources().getText(R.string.password_toggle_content_description));
     endLayout.setEndIconVisible(true);
     endLayout.setEndIconCheckable(true);
     if (isInputTypePassword(editText)) {
@@ -78,6 +79,18 @@ void tearDown() {
     }
   }
 
+  @Override
+  @DrawableRes
+  int getIconDrawableResId() {
+    return iconResId;
+  }
+
+  @Override
+  @StringRes
+  int getIconContentDescriptionResId() {
+    return R.string.password_toggle_content_description;
+  }
+
   @Override
   OnClickListener getOnIconClickListener() {
     return onIconClickListener;