[Bottom Sheet] Prevent ACTION_DOWN events on the BottomSheetHandleDragView from setting touchingScrollChild to true.

Previously, a BottomSheetHandleDragView overlapping the nestedScrollingChildRef would not always be able to resize/drag the bottom sheet.

PiperOrigin-RevId: 752730372

Author: Material Design Team

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

@@ -329,6 +329,7 @@ void onLayout(@NonNull View bottomSheet) {}
 
   @Nullable WeakReference<V> viewRef;
   @Nullable WeakReference<View> accessibilityDelegateViewRef;
+  @Nullable WeakReference<View> dragHandleViewRef;
 
   @Nullable WeakReference<View> nestedScrollingChildRef;
 
@@ -649,10 +650,11 @@ public boolean onInterceptTouchEvent(
         // Only intercept nested scrolling events here if the view not being moved by the
         // ViewDragHelper.
         if (state != STATE_SETTLING) {
-          View scroll = nestedScrollingChildRef != null ? nestedScrollingChildRef.get() : null;
-          if (scroll != null && parent.isPointInChildBounds(scroll, initialX, initialY)) {
+          if (isTouchingScrollingChild(parent, initialX, initialY)) {
             activePointerId = event.getPointerId(event.getActionIndex());
-            touchingScrollingChild = true;
+            if (!isTouchingDragHandle(parent, initialX, initialY)) {
+              touchingScrollingChild = true;
+            }
           }
         }
         ignoreEvents =
@@ -1532,6 +1534,20 @@ private float calculateCornerInterpolation(
     return 0;
   }
 
+  private boolean isTouchingScrollingChild(
+      @NonNull CoordinatorLayout parent, int xCoordinate, int yCoordinate) {
+    View scrollingChild = nestedScrollingChildRef != null ? nestedScrollingChildRef.get() : null;
+    return scrollingChild != null
+        && parent.isPointInChildBounds(scrollingChild, xCoordinate, yCoordinate);
+  }
+
+  private boolean isTouchingDragHandle(
+      @NonNull CoordinatorLayout parent, int xCoordinate, int yCoordinate) {
+    View dragHandleView = dragHandleViewRef != null ? dragHandleViewRef.get() : null;
+    return dragHandleView != null
+        && parent.isPointInChildBounds(dragHandleView, xCoordinate, yCoordinate);
+  }
+
   private boolean isAtTopOfScreen() {
     if (viewRef == null || viewRef.get() == null) {
       return false;
@@ -2020,10 +2036,7 @@ public void onViewReleased(@NonNull View releasedChild, float xvel, float yvel)
 
         @Override
         public int clampViewPositionVertical(@NonNull View child, int top, int dy) {
-          return MathUtils.clamp(
-              top,
-              getExpandedOffset(),
-              getViewVerticalDragRange(child));
+          return MathUtils.clamp(top, getExpandedOffset(), getViewVerticalDragRange(child));
         }
 
         @Override
@@ -2346,6 +2359,10 @@ private void updateImportantForAccessibility(boolean expanded) {
     }
   }
 
+  void setDragHandleView(@Nullable BottomSheetDragHandleView dragHandleView) {
+    dragHandleViewRef = dragHandleView != null ? new WeakReference<>(dragHandleView) : null;
+  }
+
   void setAccessibilityDelegateView(@Nullable View accessibilityDelegateView) {
     if (accessibilityDelegateView == null && accessibilityDelegateViewRef != null) {
       clearAccessibilityAction(

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

@@ -207,10 +207,12 @@ private void setBottomSheetBehavior(@Nullable BottomSheetBehavior<?> behavior) {
     if (bottomSheetBehavior != null) {
       bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallback);
       bottomSheetBehavior.setAccessibilityDelegateView(null);
+      bottomSheetBehavior.setDragHandleView(null);
     }
     bottomSheetBehavior = behavior;
     if (bottomSheetBehavior != null) {
       bottomSheetBehavior.setAccessibilityDelegateView(this);
+      bottomSheetBehavior.setDragHandleView(this);
       onBottomSheetStateChanged(bottomSheetBehavior.getState());
       bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback);
     }