[TimePicker][a11y] Error handling update

- properly show the chip background color when selected
- add error state with message when the hour/minute is incorrect, giving the user a visual feedback instead of just preventing inputting an incorrect value
- add vibration and beep on error or max length reached

PiperOrigin-RevId: 800583067

Author: paulfthomas

catalog/java/io/material/catalog/AndroidManifest.xml

@@ -22,6 +22,8 @@
 
   <uses-sdk />
 
+  <uses-permission android:name="android.permission.VIBRATE"/>
+
   <application
     android:name="io.material.catalog.application.${application_name}"
     android:allowBackup="true"

lib/java/com/google/android/material/timepicker/ChipTextInputComboView.java

@@ -22,6 +22,7 @@
 import static com.google.android.material.timepicker.TimePickerView.GENERIC_VIEW_ACCESSIBILITY_CLASS_NAME;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
@@ -36,13 +37,15 @@
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import com.google.android.material.chip.Chip;
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.internal.TextWatcherAdapter;
 import com.google.android.material.internal.ViewUtils;
 import com.google.android.material.textfield.TextInputLayout;
@@ -59,6 +62,15 @@ class ChipTextInputComboView extends FrameLayout implements Checkable {
   private final EditText editText;
   private TextWatcher watcher;
   private TextView label;
+  private CharSequence chipText = "";
+
+  private boolean hasError = false;
+  private ColorStateList originalChipBackgroundColor;
+  private ColorStateList originalChipTextColor;
+  private ColorStateList originalEditTextColor;
+  private ColorStateList originalEditTextCursorColor;
+  private ColorStateList originalLabelColor;
+  @ColorInt private int originalChipStrokeColor;
 
   public ChipTextInputComboView(@NonNull Context context) {
     this(context, null);
@@ -105,10 +117,14 @@ public boolean isChecked() {
   @Override
   public void setChecked(boolean checked) {
     chip.setChecked(checked);
+    if (checked) {
+      chip.setText("");
+      chip.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
+    } else {
+      chip.setText(chipText);
+      chip.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+    }
     editText.setVisibility(checked ? VISIBLE : INVISIBLE);
-    // TODO(b/247609386) Should not hide chip, we need the background in M3 (but not M2...).
-    // Instead, the text in chip should be hidden.
-    chip.setVisibility(checked ? GONE : VISIBLE);
     if (isChecked()) {
       ViewUtils.requestFocusAndShowKeyboard(editText, /* useWindowInsetsController= */ false);
     }
@@ -121,30 +137,21 @@ public void toggle() {
 
   public void setText(CharSequence text) {
     String formattedText = formatText(text);
+    chipText = formattedText;
     chip.setText(formattedText);
     if (!isEmpty(formattedText)) {
       editText.removeTextChangedListener(watcher);
 
       editText.setText(formattedText);
-      ViewCompat.setAccessibilityDelegate(
-          editText,
-          new AccessibilityDelegateCompat() {
-            @Override
-            public void onInitializeAccessibilityNodeInfo(
-                @NonNull View host, @NonNull AccessibilityNodeInfoCompat info) {
-              super.onInitializeAccessibilityNodeInfo(host, info);
-              info.setText(formattedText);
-              info.setHintText(label.getText());
-            }
-          });
+      setAccessibilityDelegate(editText, chipText.toString(), label.getText());
 
       editText.addTextChangedListener(watcher);
     }
   }
 
   @VisibleForTesting
   CharSequence getChipText() {
-    return chip.getText();
+    return chipText;
   }
 
   private String formatText(CharSequence text) {
@@ -184,21 +191,91 @@ public void setChipDelegate(AccessibilityDelegateCompat clickActionDelegate) {
     ViewCompat.setAccessibilityDelegate(chip, clickActionDelegate);
   }
 
+  public void setError(boolean hasError) {
+    if (this.hasError == hasError) {
+      return;
+    }
+    this.hasError = hasError;
+
+    if (hasError) {
+      applyErrorColors();
+    } else {
+      clearErrorColors();
+    }
+  }
+
+  private void applyErrorColors() {
+    originalChipBackgroundColor = chip.getChipBackgroundColor();
+    originalChipTextColor = chip.getTextColors();
+    originalEditTextColor = editText.getTextColors();
+    originalLabelColor = label.getTextColors();
+    originalChipStrokeColor = textInputLayout.getBoxStrokeColor();
+
+    // TODO(b/394610420): tokens and ColorStateList with error state
+    ColorStateList colorErrorContainer =
+        MaterialColors.getColorStateListOrNull(getContext(), R.attr.colorErrorContainer);
+    ColorStateList colorOnErrorContainer =
+        MaterialColors.getColorStateListOrNull(getContext(), R.attr.colorOnErrorContainer);
+    if (colorErrorContainer != null && colorOnErrorContainer != null) {
+      chip.setChipBackgroundColor(colorErrorContainer);
+      chip.setTextColor(colorOnErrorContainer);
+      editText.setTextColor(colorOnErrorContainer);
+      textInputLayout.setBoxStrokeColor(colorOnErrorContainer.getDefaultColor());
+      label.setTextColor(colorOnErrorContainer);
+      if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+        originalEditTextCursorColor = textInputLayout.getCursorColor();
+        textInputLayout.setCursorColor(colorOnErrorContainer);
+      }
+    }
+  }
+
+  private void clearErrorColors() {
+    chip.setChipBackgroundColor(originalChipBackgroundColor);
+    chip.setTextColor(originalChipTextColor);
+    editText.setTextColor(originalEditTextColor);
+    textInputLayout.setBoxStrokeColor(originalChipStrokeColor);
+    label.setTextColor(originalLabelColor);
+    if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+      textInputLayout.setCursorColor(originalEditTextCursorColor);
+    }
+  }
+
+  public boolean hasError() {
+    return hasError;
+  }
+
   private class TextFormatter extends TextWatcherAdapter {
 
     private static final String DEFAULT_TEXT = "00";
 
     @Override
     public void afterTextChanged(Editable editable) {
       if (isEmpty(editable)) {
-        chip.setText(formatText(DEFAULT_TEXT));
+        chipText = formatText(DEFAULT_TEXT);
         return;
       }
       String formattedText = formatText(editable);
-      chip.setText(isEmpty(formattedText) ? formatText(DEFAULT_TEXT) : formattedText);
+      chipText = isEmpty(formattedText) ? formatText(DEFAULT_TEXT) : formattedText;
+      setAccessibilityDelegate(editText, editable.toString(), label.getText());
     }
   }
 
+  private void setAccessibilityDelegate(
+      @NonNull View view, CharSequence text, @Nullable CharSequence hint) {
+    ViewCompat.setAccessibilityDelegate(
+        view,
+        new AccessibilityDelegateCompat() {
+          @Override
+          public void onInitializeAccessibilityNodeInfo(
+              @NonNull View host, @NonNull AccessibilityNodeInfoCompat info) {
+            super.onInitializeAccessibilityNodeInfo(host, info);
+            info.setText(text);
+            info.setHintText(hint);
+            info.setMaxTextLength(2);
+          }
+        });
+  }
+
   @Override
   protected void onConfigurationChanged(Configuration newConfig) {
     super.onConfigurationChanged(newConfig);

lib/java/com/google/android/material/timepicker/MaterialTimePicker.java

@@ -113,6 +113,7 @@ public final class MaterialTimePicker extends DialogFragment implements OnDouble
   static final String OVERRIDE_THEME_RES_ID = "TIME_PICKER_OVERRIDE_THEME_RES_ID";
 
   private MaterialButton modeButton;
+  private Button okButton;
   private Button cancelButton;
 
   @InputMode private int inputMode = INPUT_MODE_CLOCK;
@@ -275,6 +276,8 @@ public final View onCreateView(
     timePickerView.setOnDoubleTapListener(this);
     textInputStub = root.findViewById(R.id.material_textinput_timepicker);
     modeButton = root.findViewById(R.id.material_timepicker_mode_button);
+    okButton = root.findViewById(R.id.material_timepicker_ok_button);
+    cancelButton = root.findViewById(R.id.material_timepicker_cancel_button);
     TextView headerTitle = root.findViewById(R.id.header_title);
 
     if (titleResId != 0) {
@@ -284,24 +287,26 @@ public final View onCreateView(
     }
 
     updateInputMode(modeButton);
-    Button okButton = root.findViewById(R.id.material_timepicker_ok_button);
     okButton.setOnClickListener(
-        new OnClickListener() {
-          @Override
-          public void onClick(View v) {
-            for (OnClickListener listener : positiveButtonListeners) {
-              listener.onClick(v);
+        v -> {
+          if (activePresenter instanceof TimePickerTextInputPresenter) {
+            TimePickerTextInputPresenter presenter = (TimePickerTextInputPresenter) activePresenter;
+            if (presenter.hasError()) {
+              presenter.vibrateAndMaybeBeep(root.getContext());
+              return;
             }
-            dismiss();
           }
+          for (OnClickListener listener : positiveButtonListeners) {
+            listener.onClick(v);
+          }
+          dismiss();
         });
     if (positiveButtonTextResId != 0) {
       okButton.setText(positiveButtonTextResId);
     } else if (!TextUtils.isEmpty(positiveButtonText)) {
       okButton.setText(positiveButtonText);
     }
 
-    cancelButton = root.findViewById(R.id.material_timepicker_cancel_button);
     cancelButton.setOnClickListener(
         v -> {
           for (OnClickListener listener : negativeButtonListeners) {
@@ -430,6 +435,7 @@ private TimePickerPresenter initializeOrRetrieveActivePresenterForMode(
       timePickerTextInputPresenter = new TimePickerTextInputPresenter(textInputView, time);
     }
 
+    timePickerTextInputPresenter.clearError();
     timePickerTextInputPresenter.clearCheck();
 
     return timePickerTextInputPresenter;

lib/java/com/google/android/material/timepicker/MaxInputValidator.java

@@ -40,9 +40,6 @@ class TimeModel implements Parcelable {
   public static final String ZERO_LEADING_NUMBER_FORMAT = "%02d";
   public static final String NUMBER_FORMAT = "%d";
 
-  private final MaxInputValidator minuteInputValidator;
-  private final MaxInputValidator hourInputValidator;
-
   @TimeFormat final int format;
 
   int hour;
@@ -65,8 +62,6 @@ public TimeModel(int hour, int minute, @ActiveSelection int selection, @TimeForm
     this.selection = selection;
     this.format = format;
     period = getPeriod(hour);
-    minuteInputValidator = new MaxInputValidator(59);
-    hourInputValidator = new MaxInputValidator(format == CLOCK_24H ? 23 : 12);
   }
 
   protected TimeModel(Parcel in) {
@@ -119,14 +114,6 @@ public int getHourContentDescriptionResId() {
     return format == CLOCK_24H ? R.string.material_hour_24h_suffix : R.string.material_hour_suffix;
   }
 
-  public MaxInputValidator getMinuteInputValidator() {
-    return minuteInputValidator;
-  }
-
-  public MaxInputValidator getHourInputValidator() {
-    return hourInputValidator;
-  }
-
   @Override
   public int hashCode() {
     Object[] hashedFields = {format, hour, minute, selection};
@@ -164,17 +151,18 @@ public void writeToParcel(Parcel dest, int flags) {
   }
 
   @SuppressWarnings("unused")
-  public static final Parcelable.Creator<TimeModel> CREATOR = new Parcelable.Creator<TimeModel>() {
-    @Override
-    public TimeModel createFromParcel(Parcel in) {
-      return new TimeModel(in);
-    }
-
-    @Override
-    public TimeModel[] newArray(int size) {
-      return new TimeModel[size];
-    }
-  };
+  public static final Parcelable.Creator<TimeModel> CREATOR =
+      new Parcelable.Creator<TimeModel>() {
+        @Override
+        public TimeModel createFromParcel(Parcel in) {
+          return new TimeModel(in);
+        }
+
+        @Override
+        public TimeModel[] newArray(int size) {
+          return new TimeModel[size];
+        }
+      };
 
   public void setPeriod(@ClockPeriod int period) {
     if (period != this.period) {

lib/java/com/google/android/material/timepicker/TimeModel.java

@@ -131,7 +131,8 @@ private boolean onHourKeyPress(int keyCode, KeyEvent event, EditText editText) {
             && keyCode <= KeyEvent.KEYCODE_9
             && event.getAction() == KeyEvent.ACTION_UP
             && editText.getSelectionStart() == 2
-            && text.length() == 2;
+            && text.length() == 2
+            && !hourLayoutComboView.hasError();
     if (switchFocus) {
       moveSelection(MINUTE);
       return true;