Refactoring TextInputLayout.On*Listeners and restricting EndIconMode annotation.

PiperOrigin-RevId: 260516099

Author: leticiarossi

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

@@ -63,7 +63,8 @@ public void afterTextChanged(Editable s) {
   private final OnEditTextAttachedListener clearTextOnEditTextAttachedListener =
       new OnEditTextAttachedListener() {
         @Override
-        public void onEditTextAttached(EditText editText) {
+        public void onEditTextAttached(TextInputLayout textInputLayout) {
+          EditText editText = textInputLayout.getEditText();
           textInputLayout.setEndIconVisible(hasText(editText.getText()));
           // Make sure there's always only one clear text text watcher added
           textInputLayout.setEndIconCheckable(false);

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

@@ -117,15 +117,16 @@ public void onPopulateAccessibilityEvent(View host, AccessibilityEvent event) {
   private final OnEditTextAttachedListener dropdownMenuOnEditTextAttachedListener =
       new OnEditTextAttachedListener() {
         @Override
-        public void onEditTextAttached(EditText editText) {
-          AutoCompleteTextView autoCompleteTextView = castAutoCompleteTextViewOrThrow(editText);
+        public void onEditTextAttached(TextInputLayout textInputLayout) {
+          AutoCompleteTextView autoCompleteTextView =
+              castAutoCompleteTextViewOrThrow(textInputLayout.getEditText());
 
           setPopupBackground(autoCompleteTextView);
           addRippleEffect(autoCompleteTextView);
           setUpDropdownShowHideBehavior(autoCompleteTextView);
           autoCompleteTextView.setThreshold(0);
-          editText.removeTextChangedListener(exposedDropdownEndIconTextWatcher);
-          editText.addTextChangedListener(exposedDropdownEndIconTextWatcher);
+          autoCompleteTextView.removeTextChangedListener(exposedDropdownEndIconTextWatcher);
+          autoCompleteTextView.addTextChangedListener(exposedDropdownEndIconTextWatcher);
           textInputLayout.setErrorIconDrawable(null);
           textInputLayout.setTextInputAccessibilityDelegate(accessibilityDelegate);
 

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

@@ -50,7 +50,8 @@ public void afterTextChanged(Editable s) {}
   private final OnEditTextAttachedListener onEditTextAttachedListener =
       new OnEditTextAttachedListener() {
         @Override
-        public void onEditTextAttached(EditText editText) {
+        public void onEditTextAttached(TextInputLayout textInputLayout) {
+          EditText editText = textInputLayout.getEditText();
           textInputLayout.setEndIconVisible(true);
           endIconView.setChecked(!hasPasswordTransformation());
           // Make sure there's always only one password toggle text watcher added
@@ -61,7 +62,7 @@ public void onEditTextAttached(EditText editText) {
   private final OnEndIconChangedListener onEndIconChangedListener =
       new OnEndIconChangedListener() {
         @Override
-        public void onEndIconChanged(int previousIcon) {
+        public void onEndIconChanged(TextInputLayout textInputLayout, int previousIcon) {
           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

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

@@ -18,6 +18,7 @@
 
 import com.google.android.material.R;
 
+import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 import static com.google.android.material.internal.ThemeEnforcement.createThemedContext;
 import static com.google.android.material.textfield.IndicatorViewController.COUNTER_INDEX;
 
@@ -43,6 +44,7 @@
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
 import androidx.annotation.VisibleForTesting;
@@ -240,7 +242,12 @@ public class TextInputLayout extends LinearLayout {
   private boolean hasStartIconTintMode;
   private Drawable startIconDummyDrawable;
 
-  /** Values for the end icon mode. */
+  /**
+   * Values for the end icon mode.
+   *
+   * @hide
+   */
+  @RestrictTo(LIBRARY_GROUP)
   @IntDef({
     END_ICON_CUSTOM,
     END_ICON_NONE,
@@ -315,9 +322,9 @@ public interface OnEditTextAttachedListener {
      * #addOnEditTextAttachedListener(OnEditTextAttachedListener)} if the edit text is already
      * present.
      *
-     * @param editText the {@link EditText}
+     * @param textInputLayout the {@link TextInputLayout}
      */
-    void onEditTextAttached(EditText editText);
+    void onEditTextAttached(TextInputLayout textInputLayout);
   }
 
   /**
@@ -330,9 +337,10 @@ public interface OnEndIconChangedListener {
     /**
      * Called when the end icon changes.
      *
+     * @param textInputLayout the {@link TextInputLayout}
      * @param previousIcon the {@link EndIconMode} the view previously had set
      */
-    void onEndIconChanged(@EndIconMode int previousIcon);
+    void onEndIconChanged(TextInputLayout textInputLayout, @EndIconMode int previousIcon);
   }
 
   private final LinkedHashSet<OnEditTextAttachedListener> editTextAttachedListeners =
@@ -2554,7 +2562,7 @@ public void clearOnEndIconChangedListeners() {
   public void addOnEditTextAttachedListener(OnEditTextAttachedListener listener) {
     editTextAttachedListeners.add(listener);
     if (editText != null) {
-      listener.onEditTextAttached(editText);
+      listener.onEditTextAttached(this);
     }
   }
 
@@ -2774,7 +2782,7 @@ private EndIconDelegate getEndIconDelegate() {
 
   private void dispatchOnEditTextAttached() {
     for (OnEditTextAttachedListener listener : editTextAttachedListeners) {
-      listener.onEditTextAttached(editText);
+      listener.onEditTextAttached(this);
     }
   }
 
@@ -2797,7 +2805,7 @@ private boolean hasEndIcon() {
 
   private void dispatchOnEndIconChanged(@EndIconMode int previousIcon) {
     for (OnEndIconChangedListener listener : endIconChangedListeners) {
-      listener.onEndIconChanged(previousIcon);
+      listener.onEndIconChanged(this, previousIcon);
     }
   }