[CleanUp][TextField] Create EndIconDelegate.deactivate() method and remove the relevant listener

PiperOrigin-RevId: 442846789

Author: drchen

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

@@ -32,7 +32,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.animation.AnimationUtils;
-import com.google.android.material.textfield.TextInputLayout.OnEndIconChangedListener;
 
 /** Default initialization of the clear text end icon {@link TextInputLayout.EndIconMode}. */
 class ClearTextEndIconDelegate extends EndIconDelegate {
@@ -41,24 +40,6 @@ class ClearTextEndIconDelegate extends EndIconDelegate {
   private static final int ANIMATION_SCALE_DURATION = 150;
   private static final float ANIMATION_SCALE_FROM_VALUE = 0.8f;
 
-  private final OnEndIconChangedListener endIconChangedListener =
-      new OnEndIconChangedListener() {
-        @Override
-        public void onEndIconChanged(@NonNull TextInputLayout textInputLayout, int previousIcon) {
-          final EditText editText = textInputLayout.getEditText();
-          if (editText != null && previousIcon == TextInputLayout.END_ICON_CLEAR_TEXT) {
-            // Remove any listeners set on the edit text.
-            editText.post(
-                new Runnable() {
-                  @Override
-                  public void run() {
-                    // Make sure icon view is visible.
-                    animateIcon(/* show= */ true);
-                  }
-                });
-          }
-        }
-      };
 
   private final OnClickListener onIconClickListener = new OnClickListener() {
     @Override
@@ -87,16 +68,30 @@ public void onFocusChange(View v, boolean hasFocus) {
   }
 
   @Override
-  void initialize() {
+  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);
-    endLayout.addOnEndIconChangedListener(endIconChangedListener);
     initAnimators();
   }
 
+  @Override
+  void tearDown() {
+    final EditText editText = textInputLayout.getEditText();
+    if (editText != null) {
+      editText.post(
+          new Runnable() {
+            @Override
+            public void run() {
+              // Make sure icon view is visible.
+              animateIcon(/* show= */ true);
+            }
+          });
+    }
+  }
+
   @Override
   void onSuffixVisibilityChanged(boolean visible) {
     if (endLayout.getSuffixText() == null) {

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

@@ -34,7 +34,7 @@ class CustomEndIconDelegate extends EndIconDelegate {
   }
 
   @Override
-  void initialize() {
+  void setUp() {
     endLayout.setEndIconDrawable(customEndIcon);
     endLayout.setEndIconOnLongClickListener(null);
   }

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

@@ -62,7 +62,6 @@
 import com.google.android.material.shape.ShapeAppearanceModel;
 import com.google.android.material.textfield.TextInputLayout.AccessibilityDelegate;
 import com.google.android.material.textfield.TextInputLayout.BoxBackgroundMode;
-import com.google.android.material.textfield.TextInputLayout.OnEndIconChangedListener;
 
 /** Default initialization of the exposed dropdown menu {@link TextInputLayout.EndIconMode}. */
 class DropdownMenuEndIconDelegate extends EndIconDelegate {
@@ -107,23 +106,6 @@ public void onPopulateAccessibilityEvent(View host, @NonNull AccessibilityEvent
         }
       };
 
-  @SuppressLint("ClickableViewAccessibility") // There's an accessibility delegate that handles
-  // interactions with the dropdown menu.
-  private final OnEndIconChangedListener endIconChangedListener =
-      new OnEndIconChangedListener() {
-        @Override
-        public void onEndIconChanged(@NonNull TextInputLayout textInputLayout, int previousIcon) {
-          final AutoCompleteTextView editText =
-              (AutoCompleteTextView) textInputLayout.getEditText();
-          if (editText != null && previousIcon == TextInputLayout.END_ICON_DROPDOWN_MENU) {
-            // Remove any listeners set on the edit text.
-            editText.setOnTouchListener(null);
-            if (IS_LOLLIPOP) {
-              editText.setOnDismissListener(null);
-            }
-          }
-        }
-      };
 
   private final OnClickListener onIconClickListener = new OnClickListener() {
     @Override
@@ -157,7 +139,8 @@ public void onFocusChange(View v, boolean hasFocus) {
   }
 
   @Override
-  void initialize() {
+  void setUp() {
+
     // For lollipop+, the arrow icon changes orientation based on dropdown popup, otherwise it
     // always points down.
     int drawableResId =
@@ -167,7 +150,6 @@ void initialize() {
     endLayout.setEndIconDrawable(drawableResId);
     endLayout.setEndIconContentDescription(
         endLayout.getResources().getText(R.string.exposed_dropdown_menu_content_description));
-    endLayout.addOnEndIconChangedListener(endIconChangedListener);
     initAnimators();
     accessibilityManager =
         (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
@@ -187,6 +169,20 @@ public void onTouchExplorationStateChanged(boolean enabled) {
     }
   }
 
+  @SuppressLint("ClickableViewAccessibility") // There's an accessibility delegate that handles
+  // interactions with the dropdown menu.
+  @Override
+  void tearDown() {
+    final AutoCompleteTextView editText = (AutoCompleteTextView) textInputLayout.getEditText();
+    if (editText != null) {
+      // Remove any listeners set on the edit text.
+      editText.setOnTouchListener(null);
+      if (IS_LOLLIPOP) {
+        editText.setOnDismissListener(null);
+      }
+    }
+  }
+
   @Override
   boolean shouldTintIconOnError() {
     return true;

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

@@ -322,13 +322,14 @@ void setEndIconMode(@EndIconMode int endIconMode) {
     if (this.endIconMode == endIconMode) {
       return;
     }
+    getEndIconDelegate().tearDown();
     int previousEndIconMode = this.endIconMode;
     this.endIconMode = endIconMode;
     dispatchOnEndIconChanged(previousEndIconMode);
     setEndIconVisible(endIconMode != END_ICON_NONE);
     EndIconDelegate delegate = getEndIconDelegate();
     if (delegate.isBoxBackgroundModeSupported(textInputLayout.getBoxBackgroundMode())) {
-      delegate.initialize();
+      delegate.setUp();
     } else {
       throw new IllegalStateException(
           "The current box background mode "

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

@@ -51,10 +51,11 @@ abstract class EndIconDelegate {
     this.customEndIcon = customEndIcon;
   }
 
-  /**
-   * Default configurations for the specified end icon.
-   */
-  abstract void initialize();
+  /** Called when the associated end icon mode is set. */
+  abstract void setUp();
+
+  /** Called when the associated end icon mode is unset. */
+  void tearDown() {}
 
   /**
    * Whether the end icon should be tinted with the error color when the {@link TextInputLayout} is

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

@@ -27,7 +27,7 @@ class NoEndIconDelegate extends EndIconDelegate {
   }
 
   @Override
-  void initialize() {
+  void setUp() {
     endLayout.setEndIconDrawable(null);
     endLayout.setEndIconContentDescription(null);
   }

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

@@ -26,23 +26,10 @@
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.android.material.textfield.TextInputLayout.OnEndIconChangedListener;
 
 /** Default initialization of the password toggle end icon. */
 class PasswordToggleEndIconDelegate extends EndIconDelegate {
 
-  private final OnEndIconChangedListener onEndIconChangedListener =
-      new OnEndIconChangedListener() {
-        @Override
-        public void onEndIconChanged(@NonNull TextInputLayout textInputLayout, int previousIcon) {
-          final EditText editText = textInputLayout.getEditText();
-          if (editText != null && previousIcon == TextInputLayout.END_ICON_PASSWORD_TOGGLE) {
-            // If the end icon was the password toggle add it back the PasswordTransformation
-            // in case it might have been removed to make the password visible.
-            editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
-          }
-        }
-      };
 
   private final OnClickListener onIconClickListener = new OnClickListener() {
     @Override
@@ -73,21 +60,29 @@ public void onClick(View v) {
   }
 
   @Override
-  void initialize() {
+  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);
-    endLayout.addOnEndIconChangedListener(onEndIconChangedListener);
     EditText editText = textInputLayout.getEditText();
     if (isInputTypePassword(editText)) {
       // By default set the input to be disguised.
       editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
     }
   }
 
+  @Override
+  void tearDown() {
+    EditText editText = textInputLayout.getEditText();
+    if (editText != null) {
+      // Add PasswordTransformation back since it may have been removed to make passwords visible.
+      editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
+    }
+  }
+
   @Override
   OnClickListener getOnIconClickListener() {
     return onIconClickListener;