Automated g4 rollback of changelist 716328564

PiperOrigin-RevId: 720889049

Author: Material Design Team

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

@@ -29,14 +29,9 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
-import android.os.Parcel;
-import android.os.Parcelable;
 import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
 import androidx.appcompat.widget.ListPopupWindow;
-import android.text.Editable;
 import android.text.InputType;
-import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.MeasureSpec;
@@ -88,8 +83,6 @@ public class MaterialAutoCompleteTextView extends AppCompatAutoCompleteTextView
   private int simpleItemSelectedColor;
   @Nullable private ColorStateList simpleItemSelectedRippleColor;
 
-  @Nullable private CharSequence selectedItem;
-
   public MaterialAutoCompleteTextView(@NonNull Context context) {
     this(context, null);
   }
@@ -188,23 +181,6 @@ public void onItemClick(AdapterView<?> parent, View selectedView, int position,
     }
 
     attributes.recycle();
-
-    // TODO: Remove this workaround once the framework bug (b/202873898) is fixed.
-    addTextChangedListener(
-        new TextWatcher() {
-          @Override
-          public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-          @Override
-          public void onTextChanged(CharSequence s, int start, int before, int count) {}
-
-          @Override
-          public void afterTextChanged(Editable s) {
-            if (!TextUtils.equals(selectedItem, s)) {
-              selectedItem = null;
-            }
-          }
-        });
   }
 
   @Override
@@ -461,55 +437,6 @@ public CharSequence getHint() {
     return super.getHint();
   }
 
-  @Override
-  public boolean getFreezesText() {
-    // Always return false to handle the input text restoration by ourselves. This is required
-    // to avoid the auto-completion from being updated when the view is recreated.
-    return false;
-  }
-
-  @Override
-  protected void replaceText(CharSequence text) {
-    selectedItem = text;
-    super.replaceText(text);
-  }
-
-  @Override
-  public void setText(CharSequence text, boolean filter) {
-    if (!filter) {
-      // When filter is false, the text is updated by the selection from the auto-complete list.
-      selectedItem = text;
-    }
-    super.setText(text, filter);
-  }
-
-  @Override
-  @NonNull
-  public Parcelable onSaveInstanceState() {
-    Parcelable parcelable = super.onSaveInstanceState();
-    if (TextUtils.isEmpty(getText()) || !super.getFreezesText()) {
-      return parcelable;
-    }
-
-    SavedState savedState = new SavedState(parcelable);
-    // Remember if the current text is from the auto-complete selection.
-    savedState.shouldRefreshAutoCompletion = (selectedItem == null);
-    savedState.inputText = getText();
-    return savedState;
-  }
-
-  @Override
-  public void onRestoreInstanceState(Parcelable state) {
-    if (!(state instanceof SavedState)) {
-      super.onRestoreInstanceState(state);
-      return;
-    }
-
-    SavedState savedState = (SavedState) state;
-    setText(savedState.inputText, savedState.shouldRefreshAutoCompletion);
-    super.onRestoreInstanceState(savedState.getSuperState());
-  }
-
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -695,40 +622,4 @@ private boolean hasSelectedRippleColor() {
       return simpleItemSelectedRippleColor != null;
     }
   }
-
-  private static final class SavedState extends BaseSavedState {
-
-    private boolean shouldRefreshAutoCompletion;
-    private CharSequence inputText;
-
-    public SavedState(Parcelable superState) {
-      super(superState);
-    }
-
-    public SavedState(Parcel source) {
-      super(source);
-      shouldRefreshAutoCompletion = source.readInt() != 0;
-      inputText = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
-    }
-
-    @Override
-    public void writeToParcel(Parcel out, int flags) {
-      super.writeToParcel(out, flags);
-      out.writeInt(shouldRefreshAutoCompletion ? 1 : 0);
-      TextUtils.writeToParcel(inputText, out, flags);
-    }
-
-    public static final Creator<SavedState> CREATOR =
-        new Creator<SavedState>() {
-          @Override
-          public SavedState createFromParcel(Parcel source) {
-            return new SavedState(source);
-          }
-
-          @Override
-          public SavedState[] newArray(int size) {
-            return new SavedState[size];
-          }
-        };
-  }
 }