[DatePicker] Prevent empty views at the end of a month to receive key…

… events PiperOrigin-RevId: 640991014
material-components · Jun 11, 2024 · 86a3b35 · 86a3b35
1 parent 7eb2d06
commit 86a3b35
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/java/com/google/android/material/datepicker/MaterialCalendarGridView.java b/lib/java/com/google/android/material/datepicker/MaterialCalendarGridView.java
@@ -92,8 +92,10 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
     if (!result) {
       return false;
     }
-    if (getSelectedItemPosition() == INVALID_POSITION
-        || getSelectedItemPosition() >= getAdapter().firstPositionInMonth()) {
+    int selectedPosition = getSelectedItemPosition();
+    if (selectedPosition == INVALID_POSITION
+        || (selectedPosition >= getAdapter().firstPositionInMonth()
+            && selectedPosition <= getAdapter().lastPositionInMonth())) {
       return true;
     }
     if (KeyEvent.KEYCODE_DPAD_UP == keyCode) {