Automated g4 rollback of changelist 694359774

PiperOrigin-RevId: 740806136

Author: hunterstich

catalog/java/io/material/catalog/bottomsheet/BottomSheetUnscrollableContentDemoFragment.java

@@ -23,11 +23,11 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.WindowInsetsCompat;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.google.android.material.internal.ViewUtils;
@@ -67,7 +67,10 @@ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
       new WindowPreferencesManager(requireContext()).applyEdgeToEdgePreference(bottomSheetDialog.getWindow());
       bottomSheetDialog.setContentView(R.layout.cat_bottomsheet_unscrollable_content);
       View bottomSheetInternal = bottomSheetDialog.findViewById(com.google.android.material.R.id.design_bottom_sheet);
-      BottomSheetBehavior.from(bottomSheetInternal).setPeekHeight(400);
+      // BottomSheetBehavior.from(bottomSheetInternal).setPeekHeight(400);
+
+      Button closeButton = bottomSheetDialog.findViewById(R.id.close_icon);
+      closeButton.setOnClickListener(v -> bottomSheetDialog.dismiss());
 
       View bottomSheetContent = bottomSheetInternal.findViewById(R.id.bottom_drawer_3);
       ViewUtils.doOnApplyWindowInsets(bottomSheetContent, (v, insets, initialPadding) -> {

catalog/java/io/material/catalog/bottomsheet/res/drawable/ic_close_24dp.xml

@@ -0,0 +1,27 @@
+<!--
+  Copyright 2024 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:height="24dp"
+  android:width="24dp"
+  android:viewportHeight="24"
+  android:viewportWidth="24"
+  android:tint="#000000">
+    <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

catalog/java/io/material/catalog/bottomsheet/res/layout/cat_bottomsheet_standard_content.xml

@@ -74,4 +74,14 @@
       android:text="@string/cat_bottomsheet_button_label_enabled"
       android:checked="true"/>
 
+  <com.google.android.material.materialswitch.MaterialSwitch
+    android:id="@+id/cat_bottomsheet_hideable_switch"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_below="@id/cat_bottomsheet_enabled_switch"
+    android:layout_centerHorizontal="true"
+    android:layout_marginTop="16dp"
+    android:text="@string/cat_bottomsheet_hideable_switch_text"
+    android:checked="false"/>
+
 </merge>

catalog/java/io/material/catalog/bottomsheet/res/layout/cat_bottomsheet_unscrollable_content.xml

@@ -20,9 +20,27 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
+  <!--
+    Since we are providing a close affordance and this sheet does not have
+    states to move between, disable a11y focus with
+    importantForAccessibility=no and disable all announcements with
+    contentDescription=null.
+    -->
   <com.google.android.material.bottomsheet.BottomSheetDragHandleView
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
+    android:layout_height="wrap_content"
+    android:importantForAccessibility="no"
+    android:contentDescription="@null"/>
+
+  <Button
+    android:id="@+id/close_icon"
+    style="?attr/materialIconButtonFilledTonalStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="end"
+    android:layout_marginHorizontal="16dp"
+    android:contentDescription="@string/cat_bottomsheet_close_content_description"
+    app:icon="@drawable/ic_close_24dp"/>
 
   <androidx.core.widget.NestedScrollView
     android:layout_width="match_parent"

catalog/java/io/material/catalog/bottomsheet/res/values/strings.xml

@@ -51,6 +51,7 @@
   </string>
   <string name="cat_bottomsheet_button_label_enabled">Enabled</string>
   <string name="cat_bottomsheet_button_label_disabled">Disabled</string>
+  <string name="cat_bottomsheet_hideable_switch_text" translatable="false">Hideable</string>
   <string name="cat_bottomsheet_button_clicked">Button clicked</string>
   <string name="cat_bottomsheet_scrollable_content_demo_title">
     Vertically scrollable content demo
@@ -66,4 +67,5 @@
   <string name="cat_bottomsheet_label_star">Star</string>
   <string name="cat_bottomsheet_label_remove">Remove</string>
   <string name="cat_bottomsheet_label_rename">Rename</string>
+  <string name="cat_bottomsheet_close_content_description" translatable="false">Close modal sheet</string>
 </resources>

docs/components/BottomSheet.md

@@ -233,13 +233,14 @@ The contents within a bottom sheet should follow their own accessibility
 guidelines, such as setting content descriptions for images.
 
 To support dragging bottom sheets with accessibility services such as TalkBack,
-Voice Access, Switch Access, etc., we provide a convenient widget
-`BottomSheetDragHandleView` which will automatically receive and handle
+Voice Access, Switch Access, etc., we provide a convenient widget,
+`BottomSheetDragHandleView`, which will automatically receive and handle
 accessibility commands to expand and collapse the attached bottom sheet when
-the accessibility mode is enabled. To use `BottomSheetDragHandleView`, you can
-add it to the top of your bottom sheet content. It will show a customizable
-visual indicator for all users. See the example in the below section for how to
-add a drag handle to your bottom sheet.
+the accessibility mode is enabled. The handle also supports tapping to cycle
+through expanded and collapsed states as well as double tapping to hide. To
+use`BottomSheetDragHandleView`, you can add it to the top of your bottom sheet
+content. It will show a customizable visual indicator for all users. See the
+example in the below section for how to add a drag handle to your bottom sheet.
 
 **Note:** `BottomSheetDragHandleView` has a default min width and height of 48dp
 to conform to the minimum touch target requirement. So you will need to preserve

lib/java/com/google/android/material/bottomsheet/BottomSheetDragHandleView.java

@@ -21,15 +21,20 @@
 import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED;
 import static com.google.android.material.theme.overlay.MaterialThemeOverlay.wrap;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.GestureDetector.OnGestureListener;
+import android.view.GestureDetector.SimpleOnGestureListener;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
@@ -46,18 +51,25 @@
  * clickable. Clicking the drag handle will toggle the bottom sheet between its collapsed and
  * expanded states.
  */
-public class BottomSheetDragHandleView extends AppCompatImageView
-    implements AccessibilityStateChangeListener {
+public class BottomSheetDragHandleView extends AppCompatImageView {
   private static final int DEF_STYLE_RES = R.style.Widget_Material3_BottomSheet_DragHandle;
 
-  @Nullable private final AccessibilityManager accessibilityManager;
-
   @Nullable private BottomSheetBehavior<?> bottomSheetBehavior;
 
-  private boolean accessibilityServiceEnabled;
-  private boolean interactable;
+  private final GestureDetector gestureDetector;
+
   private boolean clickToExpand;
 
+  /**
+   * Track whether clients have set their own touch or click listeners on the drag handle.
+   *
+   * Setting a custom touch or click listener will override the default behavior of cycling through
+   * bottom sheet states when tapped and dismissing the sheet when double tapped. Clients can
+   * restore this behavior by setting their touch and click listeners back to null.
+   */
+  private boolean hasTouchListener = false;
+  private boolean hasClickListener = false;
+
   private final String clickToExpandActionLabel =
       getResources().getString(R.string.bottomsheet_action_expand);
   private final String clickToCollapseActionLabel =
@@ -75,6 +87,34 @@ public void onStateChanged(
         public void onSlide(@NonNull View bottomSheet, float slideOffset) {}
       };
 
+  /**
+   * A gesture listener that handles both single and double taps on the drag handle.
+   *
+   * Single taps cycle through the available states of the bottom sheet. A double tap hides
+   * the sheet.
+   */
+  private final OnGestureListener gestureListener = new SimpleOnGestureListener() {
+
+    @Override
+    public boolean onDown(@NonNull MotionEvent e) {
+      return isClickable();
+    }
+
+    @Override
+    public boolean onSingleTapConfirmed(@NonNull MotionEvent e) {
+      return expandOrCollapseBottomSheetIfPossible();
+    }
+
+    @Override
+    public boolean onDoubleTap(@NonNull MotionEvent e) {
+      if (bottomSheetBehavior != null && bottomSheetBehavior.isHideable()) {
+        bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+        return true;
+      }
+      return super.onDoubleTap(e);
+    }
+  };
+
   public BottomSheetDragHandleView(@NonNull Context context) {
     this(context, /* attrs= */ null);
   }
@@ -83,17 +123,16 @@ public BottomSheetDragHandleView(@NonNull Context context, @Nullable AttributeSe
     this(context, attrs, R.attr.bottomSheetDragHandleStyle);
   }
 
+  @SuppressLint("ClickableViewAccessibility") // Will be handled by accessibility delegate
   public BottomSheetDragHandleView(
       @NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
     super(wrap(context, attrs, defStyleAttr, DEF_STYLE_RES), attrs, defStyleAttr);
 
     // Override the provided context with the wrapped one to prevent it from being used.
     context = getContext();
 
-    accessibilityManager =
-        (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
-
-    updateInteractableState();
+    gestureDetector =
+        new GestureDetector(context, gestureListener, new Handler(Looper.getMainLooper()));
 
     ViewCompat.setAccessibilityDelegate(
         this,
@@ -112,25 +151,36 @@ public void onPopulateAccessibilityEvent(View host, @NonNull AccessibilityEvent
   protected void onAttachedToWindow() {
     super.onAttachedToWindow();
     setBottomSheetBehavior(findParentBottomSheetBehavior());
-    if (accessibilityManager != null) {
-      accessibilityManager.addAccessibilityStateChangeListener(this);
-      onAccessibilityStateChanged(accessibilityManager.isEnabled());
-    }
   }
 
   @Override
   protected void onDetachedFromWindow() {
-    if (accessibilityManager != null) {
-      accessibilityManager.removeAccessibilityStateChangeListener(this);
-    }
     setBottomSheetBehavior(null);
     super.onDetachedFromWindow();
   }
 
+  @SuppressLint("ClickableViewAccessibility") // Will be handled by accessibility delegate
+  @Override
+  public boolean onTouchEvent(MotionEvent event) {
+    if (hasClickListener || hasTouchListener) {
+      // If clients have set their own click or touch listeners, do nothing.
+      return super.onTouchEvent(event);
+    }
+
+    return gestureDetector.onTouchEvent(event);
+  }
+
+  @SuppressLint("ClickableViewAccessibility")
+  @Override
+  public void setOnTouchListener(OnTouchListener l) {
+    hasTouchListener = l != null;
+    super.setOnTouchListener(l);
+  }
+
   @Override
-  public void onAccessibilityStateChanged(boolean enabled) {
-    accessibilityServiceEnabled = enabled;
-    updateInteractableState();
+  public void setOnClickListener(@Nullable OnClickListener l) {
+    hasClickListener = l != null;
+    super.setOnClickListener(l);
   }
 
   private void setBottomSheetBehavior(@Nullable BottomSheetBehavior<?> behavior) {
@@ -144,7 +194,7 @@ private void setBottomSheetBehavior(@Nullable BottomSheetBehavior<?> behavior) {
       onBottomSheetStateChanged(bottomSheetBehavior.getState());
       bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback);
     }
-    updateInteractableState();
+    setClickable(hasAttachedBehavior());
   }
 
   private void onBottomSheetStateChanged(@BottomSheetBehavior.State int state) {
@@ -160,12 +210,8 @@ private void onBottomSheetStateChanged(@BottomSheetBehavior.State int state) {
         (v, args) -> expandOrCollapseBottomSheetIfPossible());
   }
 
-  private void updateInteractableState() {
-    interactable = accessibilityServiceEnabled && bottomSheetBehavior != null;
-    setImportantForAccessibility(bottomSheetBehavior != null
-        ? View.IMPORTANT_FOR_ACCESSIBILITY_YES
-        : View.IMPORTANT_FOR_ACCESSIBILITY_NO);
-    setClickable(interactable);
+  private boolean hasAttachedBehavior() {
+    return bottomSheetBehavior != null;
   }
 
   /**
@@ -179,7 +225,7 @@ private void updateInteractableState() {
    * the previous state was EXPANDED) or EXPANDED (when the previous state was COLLAPSED.)
    */
   private boolean expandOrCollapseBottomSheetIfPossible() {
-    if (!interactable) {
+    if (!hasAttachedBehavior()) {
       return false;
     }
     boolean canHalfExpand =