[TimePicker] Only clear hour/minute fields when a digit is entered

Fixes issue with keyboard navigation that unnecessarily clears the text. PiperOrigin-RevId: 620286833
material-components · Apr 2, 2024 · 4f21b95 · 4f21b95
1 parent 0a21fe7
commit 4f21b95
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/java/com/google/android/material/timepicker/TimePickerTextInputKeyController.java b/lib/java/com/google/android/material/timepicker/TimePickerTextInputKeyController.java
@@ -112,7 +112,9 @@ private boolean onMinuteKeyPress(int keyCode, KeyEvent event, EditText editText)
  return true;
  }
 
- clearPrefilledText(editText);
+ if (keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) {
+ clearPrefilledText(editText);
+ }
 
  return false;
  }
@@ -135,7 +137,9 @@ private boolean onHourKeyPress(int keyCode, KeyEvent event, EditText editText) {
  return true;
  }
 
- clearPrefilledText(editText);
+ if (keyCode >= KeyEvent.KEYCODE_0 && keyCode <= KeyEvent.KEYCODE_9) {
+ clearPrefilledText(editText);
+ }
 
  return false;
  }

diff --git a/...avatests/com/google/android/material/timepicker/TimePickerTextInputKeyControllerTest.java b/...avatests/com/google/android/material/timepicker/TimePickerTextInputKeyControllerTest.java
@@ -121,6 +121,17 @@ public void controller_clearPrefilledText_shouldNotClearWhenPartialText() {
  assertThat(editText.getText().length()).isEqualTo(1);
  }
 
+ @Test
+ public void controller_clearPrefilledText_shouldNotClearWhenNotDigit() {
+ EditText editText = hourInput.getTextInput().getEditText();
+ editText.setText("0");
+ editText.setSelection(0);
+ pressKeys(editText, KeyEvent.KEYCODE_DPAD_RIGHT);
+ shadowOf(getMainLooper()).idle();
+
+ assertThat(editText.getText().length()).isEqualTo(1);
+ }
+
  @Test
  public void afterTextChanged_validHourInput_formatsText() {
  EditText editText = hourInput.getTextInput().getEditText();