[BottomSheet] Make handle respond to keyboard input

PiperOrigin-RevId: 775207544

Author: paulfthomas

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

@@ -31,6 +31,7 @@
 import android.view.GestureDetector;
 import android.view.GestureDetector.OnGestureListener;
 import android.view.GestureDetector.SimpleOnGestureListener;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
@@ -366,4 +367,24 @@ private static View getParentView(View view) {
     ViewParent parent = view.getParent();
     return parent instanceof View ? (View) parent : null;
   }
+
+  @Override
+  public boolean onKeyDown(int keyCode, @NonNull KeyEvent event) {
+    if (!isEnabled()) {
+      return super.onKeyDown(keyCode, event);
+    }
+
+    switch (keyCode) {
+      case KeyEvent.KEYCODE_DPAD_CENTER:
+      case KeyEvent.KEYCODE_ENTER:
+        if (hasClickListener) {
+          return performClick();
+        }
+        return expandOrCollapseBottomSheetIfPossible();
+      default:
+        // Nothing to do in this case.
+    }
+
+    return super.onKeyDown(keyCode, event);
+  }
 }

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

@@ -27,6 +27,7 @@
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import android.util.SparseIntArray;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.view.accessibility.AccessibilityManager;
@@ -109,6 +110,25 @@ public void test_customClickListenerOverridesInternalClickBehavior() {
         .isEqualTo(BottomSheetBehavior.STATE_EXPANDED);
   }
 
+  @Test
+  public void test_customClickListenerOverridesInternalClickBehaviorWithKeyboardEnter() {
+    activity.addViewToBottomSheet(dragHandleView);
+    activity.bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+    shadowOf(accessibilityManager).setEnabled(true);
+    dragHandleView.setOnClickListener(
+        v -> {
+          // do nothing
+        });
+
+    boolean unused =
+        dragHandleView.onKeyDown(
+            KeyEvent.KEYCODE_ENTER, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+    assertThat(activity.bottomSheetBehavior.getState())
+        .isEqualTo(BottomSheetBehavior.STATE_EXPANDED);
+  }
+
   @Test
   public void test_notInteractableWhenNotAttachedToBottomSheetAndAccessibilityEnabled() {
     activity.addViewToContainer(dragHandleView);
@@ -152,6 +172,39 @@ public void test_collapseExpandedBottomSheetWhenClicked() {
         .isEqualTo(BottomSheetBehavior.STATE_COLLAPSED);
   }
 
+  @Test
+  public void test_expandCollapsedBottomSheetWithKeyboardEnter() {
+    activity.bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+    activity.addViewToBottomSheet(dragHandleView);
+    shadowOf(accessibilityManager).setEnabled(true);
+    boolean unused =
+        dragHandleView.onKeyDown(
+            KeyEvent.KEYCODE_ENTER, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
+
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+    assertThat(activity.bottomSheetBehavior.getState())
+        .isEqualTo(BottomSheetBehavior.STATE_EXPANDED);
+  }
+
+  @Test
+  public void test_collapseExpandedBottomSheetWithKeyboardEnter() {
+    activity.bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+    activity.addViewToBottomSheet(dragHandleView);
+    shadowOf(accessibilityManager).setEnabled(true);
+
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+    boolean unused =
+        dragHandleView.onKeyDown(
+            KeyEvent.KEYCODE_ENTER, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
+
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+    assertThat(activity.bottomSheetBehavior.getState())
+        .isEqualTo(BottomSheetBehavior.STATE_COLLAPSED);
+  }
+
   @Test
   public void test_collapsedBottomSheetMoveToHalfExpanded_whenClickedAndFitToContentsFalse() {
     activity.bottomSheetBehavior.setFitToContents(false);