[ExposedDropdownMenu] Dismiss modal popup in dismissDropDown

PiperOrigin-RevId: 484502383

Author: Material Design Team

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

@@ -174,13 +174,36 @@ public void onItemClick(AdapterView<?> parent, View selectedView, int position,
 
   @Override
   public void showDropDown() {
-    if (accessibilityManager != null && accessibilityManager.isTouchExplorationEnabled()) {
+    if (isTouchExplorationEnabled()) {
       modalListPopup.show();
     } else {
       super.showDropDown();
     }
   }
 
+  @Override
+  public void dismissDropDown() {
+    if (isTouchExplorationEnabled()) {
+      modalListPopup.dismiss();
+    } else {
+      super.dismissDropDown();
+    }
+  }
+
+  @Override
+  public void onWindowFocusChanged(boolean hasWindowFocus) {
+    if (isTouchExplorationEnabled()) {
+      // Do not dismissDropDown if touch exploration is enabled, in case the window lost focus
+      // in favor of the modalListPopup.
+      return;
+    }
+    super.onWindowFocusChanged(hasWindowFocus);
+  }
+
+  private boolean isTouchExplorationEnabled() {
+    return accessibilityManager != null && accessibilityManager.isTouchExplorationEnabled();
+  }
+
   @Override
   public <T extends ListAdapter & Filterable> void setAdapter(@Nullable T adapter) {
     super.setAdapter(adapter);
@@ -315,6 +338,12 @@ protected void onAttachedToWindow() {
     }
   }
 
+  @Override
+  protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    modalListPopup.dismiss();
+  }
+
   @Nullable
   @Override
   public CharSequence getHint() {