[BottomSheet] Prevent adding half expanded accessibility action if fitToContents is true

cketcham · hunterstich · commit 2933600552b9 · 2021-02-17T06:45:07.000-08:00
PiperOrigin-RevId: 356805609
diff --git a/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java b/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
@@ -1792,7 +1792,7 @@ private void updateAccessibilityActions() {
     if (expandHalfwayActionId != View.NO_ID) {
       ViewCompat.removeAccessibilityAction(child, expandHalfwayActionId);
     }
-    if (state != STATE_HALF_EXPANDED) {
+    if (!fitToContents && state != STATE_HALF_EXPANDED) {
       expandHalfwayActionId =
           addAccessibilityActionForState(
               child, R.string.bottomsheet_action_expand_halfway, STATE_HALF_EXPANDED);

Original file line number	Diff line number	Diff line change
`@@ -1792,7 +1792,7 @@ private void updateAccessibilityActions() {`
`1792`	`1792`	`if (expandHalfwayActionId != View.NO_ID) {`
`1793`	`1793`	`ViewCompat.removeAccessibilityAction(child, expandHalfwayActionId);`
`1794`	`1794`	`}`
`1795`		`- if (state != STATE_HALF_EXPANDED) {`
	`1795`	`+ if (!fitToContents && state != STATE_HALF_EXPANDED) {`
`1796`	`1796`	`expandHalfwayActionId =`
`1797`	`1797`	`addAccessibilityActionForState(`
`1798`	`1798`	`child, R.string.bottomsheet_action_expand_halfway, STATE_HALF_EXPANDED);`