[Bottom Sheet] Update a11y actions and drag handle click to not include collapsed state if skipCollapsed=true && hideable=true

PiperOrigin-RevId: 883185600

Author: dsn5ft

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

@@ -1246,6 +1246,10 @@ public boolean getSkipCollapsed() {
     return skipCollapsed;
   }
 
+  boolean canCollapse() {
+    return !skipCollapsed || !hideable;
+  }
+
   /**
    * Sets whether this bottom sheet can be collapsed/expanded by dragging. Note: When disabling
    * dragging, an app will require to implement a custom way to expand/collapse the bottom sheet
@@ -2503,18 +2507,22 @@ private void updateAccessibilityActions(View view, int viewIndex) {
     switch (state) {
       case STATE_EXPANDED:
         {
-          collapseActionIds.put(
-              viewIndex,
-              addAccessibilityActionForState(
-                  view, R.string.bottomsheet_action_collapse, STATE_COLLAPSED));
+          if (canCollapse()) {
+            collapseActionIds.put(
+                viewIndex,
+                addAccessibilityActionForState(
+                    view, R.string.bottomsheet_action_collapse, STATE_COLLAPSED));
+          }
           break;
         }
       case STATE_HALF_EXPANDED:
         {
-          collapseActionIds.put(
-              viewIndex,
-              addAccessibilityActionForState(
-                  view, R.string.bottomsheet_action_collapse, STATE_COLLAPSED));
+          if (canCollapse()) {
+            collapseActionIds.put(
+                viewIndex,
+                addAccessibilityActionForState(
+                    view, R.string.bottomsheet_action_collapse, STATE_COLLAPSED));
+          }
           expandActionIds.put(
               viewIndex,
               addAccessibilityActionForState(

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

@@ -326,16 +326,18 @@ private int getNextState() {
                 : BottomSheetBehavior.STATE_EXPANDED;
         break;
       case BottomSheetBehavior.STATE_EXPANDED:
-        nextState =
-            canHalfExpand
-                ? BottomSheetBehavior.STATE_HALF_EXPANDED
-                : BottomSheetBehavior.STATE_COLLAPSED;
+        if (canHalfExpand) {
+          nextState = BottomSheetBehavior.STATE_HALF_EXPANDED;
+        } else if (bottomSheetBehavior.canCollapse()) {
+          nextState = BottomSheetBehavior.STATE_COLLAPSED;
+        }
         break;
       case BottomSheetBehavior.STATE_HALF_EXPANDED:
-        nextState =
-            clickToExpand
-                ? BottomSheetBehavior.STATE_EXPANDED
-                : BottomSheetBehavior.STATE_COLLAPSED;
+        if (clickToExpand) {
+          nextState = BottomSheetBehavior.STATE_EXPANDED;
+        } else if (bottomSheetBehavior.canCollapse()) {
+          nextState = BottomSheetBehavior.STATE_COLLAPSED;
+        }
         break;
       default: // fall out
     }

lib/javatests/com/google/android/material/bottomsheet/BottomSheetDragHandleTest.java

@@ -415,6 +415,40 @@ public void test_customActionSetInExpandedStateWhenHideable() {
     assertThat(hasAccessibilityAction(dragHandleView, ACTION_DISMISS.getId())).isTrue();
   }
 
+  @Test
+  public void test_customActionSetInExpandedStateWhenHideableAndSkipCollapsed() {
+    activity.bottomSheetBehavior.setHideable(true);
+    activity.bottomSheetBehavior.setSkipCollapsed(true);
+    activity.bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+    activity.addViewToBottomSheet(dragHandleView);
+    shadowOf(accessibilityManager).setEnabled(true);
+
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+    BottomSheetBehavior<View> behavior = activity.bottomSheetBehavior;
+    assertThat(hasCustomAccessibilityAction(behavior.expandHalfwayActionIds)).isFalse();
+    assertThat(hasCustomAccessibilityAction(behavior.expandActionIds)).isFalse();
+    assertThat(hasCustomAccessibilityAction(behavior.collapseActionIds)).isFalse();
+    assertThat(hasAccessibilityAction(dragHandleView, ACTION_DISMISS.getId())).isTrue();
+  }
+
+  @Test
+  public void test_customActionSetInExpandedStateWhenNotHideableAndSkipCollapsed() {
+    activity.bottomSheetBehavior.setHideable(false);
+    activity.bottomSheetBehavior.setSkipCollapsed(true);
+    activity.bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+    activity.addViewToBottomSheet(dragHandleView);
+    shadowOf(accessibilityManager).setEnabled(true);
+
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+    BottomSheetBehavior<View> behavior = activity.bottomSheetBehavior;
+    assertThat(hasCustomAccessibilityAction(behavior.expandHalfwayActionIds)).isFalse();
+    assertThat(hasCustomAccessibilityAction(behavior.expandActionIds)).isFalse();
+    assertThat(hasCustomAccessibilityAction(behavior.collapseActionIds)).isTrue();
+    assertThat(hasAccessibilityAction(dragHandleView, ACTION_DISMISS.getId())).isFalse();
+  }
+
   private void assertImportantForAccessibility(boolean important) {
     if (important) {
       assertThat(dragHandleView.getImportantForAccessibility())

tests/javatests/com/google/android/material/bottomsheet/BottomSheetBehaviorTest.java

@@ -1149,8 +1149,9 @@ private static void assertAccessibilityActions(
     boolean hasHalfExpandAction =
         state != BottomSheetBehavior.STATE_HALF_EXPANDED && !behavior.isFitToContents();
     boolean hasCollapseAction =
-        state == BottomSheetBehavior.STATE_EXPANDED
-            || state == BottomSheetBehavior.STATE_HALF_EXPANDED;
+        (state == BottomSheetBehavior.STATE_EXPANDED
+                || state == BottomSheetBehavior.STATE_HALF_EXPANDED)
+            && (!behavior.getSkipCollapsed() || !behavior.isHideable());
     boolean hasDismissAction = state != BottomSheetBehavior.STATE_HIDDEN && behavior.isHideable();
     assertThat(
         hasCustomAccessibilityAction(behavior.expandActionIds),