[TimePicker] Fixed Talback support

PiperOrigin-RevId: 322589365

Author: ymarian

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

@@ -19,6 +19,8 @@
 import com.google.android.material.R;
 
 import android.content.Context;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.TextUtils;
@@ -28,6 +30,7 @@
 import android.widget.Checkable;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.chip.Chip;
@@ -45,6 +48,7 @@ class ChipTextInputComboView extends FrameLayout implements Checkable {
   private final TextInputLayout textInputLayout;
   private final EditText editText;
   private TextWatcher watcher;
+  private TextView label;
 
   public ChipTextInputComboView(@NonNull Context context) {
     this(context, null);
@@ -66,6 +70,7 @@ public ChipTextInputComboView(
     editText.addTextChangedListener(watcher);
     addView(chip);
     addView(textInputLayout);
+    label = findViewById(R.id.material_label);
   }
 
   @Override
@@ -111,11 +116,7 @@ public void setTag(int key, Object tag) {
   }
 
   public void setHelperText(CharSequence helperText) {
-    textInputLayout.setHelperText(helperText);
-  }
-
-  public void setError(String error) {
-    textInputLayout.setError(error);
+    label.setText(helperText);
   }
 
   public void setCursorVisible(boolean visible) {
@@ -133,6 +134,10 @@ public TextInputLayout getTextInput() {
     return textInputLayout;
   }
 
+  public void setChipDelegate(AccessibilityDelegateCompat clickActionDelegate) {
+    ViewCompat.setAccessibilityDelegate(chip, clickActionDelegate);
+  }
+
   private class HintSetterTextWatcher extends TextWatcherAdapter {
 
     private static final String DEFAULT_HINT = "00";
@@ -141,6 +146,8 @@ public void afterTextChanged(Editable editable) {
       if (TextUtils.isEmpty(editable)) {
         setText(DEFAULT_HINT);
         return;
+      } else {
+        textInputLayout.getEditText().setHint(null);
       }
 
       chip.setText(editable.toString());

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.material.timepicker;
+
+import android.content.Context;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
+import android.view.View;
+
+class ClickActionDelegate extends AccessibilityDelegateCompat {
+  private final AccessibilityActionCompat clickAction;
+
+  public ClickActionDelegate(Context context, int resId) {
+    clickAction =
+        new AccessibilityActionCompat(
+            AccessibilityNodeInfoCompat.ACTION_CLICK, context.getString(resId));
+  }
+
+  @Override
+  public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {
+    super.onInitializeAccessibilityNodeInfo(host, info);
+    info.addAction(clickAction);
+  }
+}

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

@@ -18,6 +18,7 @@
 
 import com.google.android.material.R;
 
+import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionInfoCompat.SELECTION_MODE_SINGLE;
 import static java.lang.Math.abs;
 import static java.lang.Math.max;
 
@@ -30,16 +31,24 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Shader.TileMode;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionItemInfoCompat;
 import androidx.appcompat.content.res.AppCompatResources;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewTreeObserver.OnPreDrawListener;
+import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.FloatRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.timepicker.ClockHandView.OnRotateListener;
 
@@ -58,6 +67,8 @@ public class ClockFaceView extends RadialViewGroup implements OnRotateListener {
   private final RectF scratch = new RectF();
 
   private final SparseArray<TextView> textViewPool = new SparseArray<>();
+  private final AccessibilityDelegateCompat valueAccessibilityDelegate;
+
   private final int[] gradientColors;
   private final float[] gradientPositions = new float[] {0f, 0.9f, 1f};
   private final int clockHandPadding;
@@ -112,19 +123,42 @@ public boolean onPreDraw() {
                 return true;
               }
             });
+
+    setFocusable(true);
     a.recycle();
+    valueAccessibilityDelegate =
+        new AccessibilityDelegateCompat() {
+          @Override
+          public void onInitializeAccessibilityNodeInfo(
+              View host, @NonNull AccessibilityNodeInfoCompat info) {
+            super.onInitializeAccessibilityNodeInfo(host, info);
+            int index = (int) host.getTag(R.id.material_value_index);
+            if (index > 0) {
+              info.setTraversalAfter(textViewPool.get(index - 1));
+            }
+
+            info.setCollectionItemInfo(
+                CollectionItemInfoCompat.obtain(
+                    /* rowIndex= */ 0,
+                    /* rowSpan= */ 1,
+                    /* columnIndex =*/ index,
+                    /* columnSpan= */ 1,
+                    /* heading= */ false,
+                    /* selected= */ host.isSelected()));
+          }
+        };
   }
 
   /**
    * Sets the list of values that will be shown in the clock face. The first value will be shown in
    * the 12 O'Clock position, subsequent values will be evenly distributed after.
    */
-  public void setValues(String[] values) {
+  public void setValues(String[] values, @StringRes int contentDescription) {
     this.values = values;
-    updateTextViews();
+    updateTextViews(contentDescription);
   }
 
-  private void updateTextViews() {
+  private void updateTextViews(@StringRes int contentDescription) {
     LayoutInflater inflater = LayoutInflater.from(getContext());
     for (int i = 0; i < max(values.length, textViewPool.size()); ++i) {
       TextView textView = textViewPool.get(i);
@@ -140,11 +174,28 @@ private void updateTextViews() {
         textViewPool.put(i, textView);
       }
 
-      textView.setTextColor(textColor);
       textView.setText(values[i]);
+      textView.setTag(R.id.material_value_index, i);
+      ViewCompat.setAccessibilityDelegate(textView, valueAccessibilityDelegate);
+
+      textView.setTextColor(textColor);
+      Resources res = getResources();
+      textView.setContentDescription(res.getString(contentDescription, values[i]));
     }
   }
 
+  @Override
+  public void onInitializeAccessibilityNodeInfo(@NonNull AccessibilityNodeInfo info) {
+    super.onInitializeAccessibilityNodeInfo(info);
+    AccessibilityNodeInfoCompat infoCompat = AccessibilityNodeInfoCompat.wrap(info);
+    infoCompat.setCollectionInfo(
+        CollectionInfoCompat.obtain(
+            /* rowCount= */ 1,
+            /* columnCount= */ values.length,
+            /* hierarchical= */ false,
+            SELECTION_MODE_SINGLE));
+  }
+
   @Override
   public void setRadius(int radius) {
     if (radius != getRadius()) {
@@ -169,7 +220,9 @@ private void findIntersectingTextView() {
     for (int i = 0; i < textViewPool.size(); ++i) {
       TextView tv = textViewPool.get(i);
       tv.getDrawingRect(textViewRect);
+      textViewRect.offset(tv.getPaddingLeft(), getPaddingTop());
       offsetDescendantRectToMyCoords(tv, textViewRect);
+
       scratch.set(textViewRect);
       RadialGradient radialGradient = getGradientForTextView(selectorBox, scratch);
       tv.getPaint().setShader(radialGradient);

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

@@ -30,6 +30,7 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.Pair;
 import android.view.MotionEvent;
@@ -107,6 +108,7 @@ public ClockHandView(Context context, @Nullable AttributeSet attrs, int defStyle
     setHandRotation(0);
 
     scaledTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+    ViewCompat.setImportantForAccessibility(this, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_NO);
     a.recycle();
   }
 
@@ -265,8 +267,8 @@ public void setCircleRadius(@Dimension int circleRadius) {
     invalidate();
   }
 
-  @SuppressLint("ClickableViewAccessibility")
   @Override
+  @SuppressLint("ClickableViewAccessibility")
   public boolean onTouchEvent(MotionEvent event) {
     int action = event.getActionMasked();
     boolean forceSelection = false;

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

@@ -16,16 +16,20 @@
 
 package com.google.android.material.timepicker;
 
+import com.google.android.material.R;
+
 import static android.view.HapticFeedbackConstants.CLOCK_TICK;
 import static android.view.HapticFeedbackConstants.VIRTUAL_KEY;
 import static android.view.View.GONE;
+import static androidx.core.content.ContextCompat.getSystemService;
 import static com.google.android.material.timepicker.TimeFormat.CLOCK_12H;
 import static com.google.android.material.timepicker.TimeFormat.CLOCK_24H;
 import static java.util.Calendar.MINUTE;
 
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.view.View;
+import android.view.accessibility.AccessibilityManager;
 import com.google.android.material.timepicker.ClockHandView.OnActionUpListener;
 import com.google.android.material.timepicker.ClockHandView.OnRotateListener;
 import com.google.android.material.timepicker.TimePickerControls.ActiveSelection;
@@ -154,9 +158,15 @@ void setSelection(@ActiveSelection int selection, boolean animate) {
     // Don't animate hours since we are going to auto switch to the minute selection.
     timePickerView.setAnimateOnTouchUp(isMinute);
     time.selection = selection;
-    timePickerView.setValues(isMinute ? MINUTE_CLOCK_VALUES : getHourClockValues());
+    timePickerView.setValues(
+        isMinute ? MINUTE_CLOCK_VALUES : getHourClockValues(),
+        isMinute ? R.string.material_minute_suffix : R.string.material_hour_suffix);
     timePickerView.setHandRotation(isMinute ? minuteRotation : hourRotation, animate);
     timePickerView.setActiveSelection(selection);
+    timePickerView.setMinuteHourDelegate(
+        new ClickActionDelegate(timePickerView.getContext(), R.string.material_hour_selection));
+    timePickerView.setHourClickDelegate(
+        new ClickActionDelegate(timePickerView.getContext(), R.string.material_minute_selection));
   }
 
   @Override
@@ -169,7 +179,13 @@ public void onActionUp(float rotation, boolean moveInEventStream) {
       // Snap to the closest hour before animating to the position the minute selection is on.
       timePickerView.setHandRotation(hourRotation, /* animate= */ false);
       // Automatically move to minutes once the user finishes choosing the hour.
-      setSelection(MINUTE, /* animate= */ true);
+
+      AccessibilityManager am =
+          getSystemService(timePickerView.getContext(), AccessibilityManager.class);
+      boolean isExploreByTouchEnabled = am.isTouchExplorationEnabled();
+      if (!isExploreByTouchEnabled) {
+        setSelection(MINUTE, /* animate= */ true);
+      }
     } else {
       int rotationInt = Math.round(rotation);
       if (!moveInEventStream) {

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

@@ -18,6 +18,7 @@
 
 import androidx.annotation.IntDef;
 import androidx.annotation.IntRange;
+import androidx.annotation.StringRes;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Calendar;
@@ -46,7 +47,7 @@ interface TimePickerControls {
   void setActiveSelection(@ActiveSelection int selection);
 
   /** Set the values in the clock face. */
-  void setValues(String[] clockValues);
+  void setValues(String[] clockValues, @StringRes int contentDescription);
 
   void setHandRotation(float rotation);
 }

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

@@ -28,6 +28,8 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -36,6 +38,7 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import com.google.android.material.button.MaterialButtonToggleGroup;
 import com.google.android.material.button.MaterialButtonToggleGroup.OnButtonCheckedListener;
 import com.google.android.material.internal.TextWatcherAdapter;
@@ -89,12 +92,15 @@ public void afterTextChanged(Editable s) {
   public TimePickerTextInputPresenter(LinearLayout timePickerView, TimeModel time) {
     this.timePickerView = timePickerView;
     this.time = time;
-
     Resources res = timePickerView.getResources();
     minuteTextInput = timePickerView.findViewById(R.id.material_minute_text_input);
     hourTextInput = timePickerView.findViewById(R.id.material_hour_text_input);
-    hourTextInput.setHelperText(res.getString(R.string.material_timepicker_hour));
-    minuteTextInput.setHelperText(res.getString(R.string.material_timepicker_minute));
+
+    TextView minuteLabel = minuteTextInput.findViewById(R.id.material_label);
+    TextView hourLabel = hourTextInput.findViewById(R.id.material_label);
+
+    minuteLabel.setText(res.getString(R.string.material_timepicker_minute));
+    hourLabel.setText(res.getString(R.string.material_timepicker_hour));
     minuteTextInput.setTag(R.id.selection_type, MINUTE);
     hourTextInput.setTag(R.id.selection_type, HOUR);
 
@@ -117,7 +123,17 @@ public void onClick(View v) {
 
     hourEditText = hourTextInput.getTextInput().getEditText();
     minuteEditText = minuteTextInput.getTextInput().getEditText();
+
+    if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) {
+      minuteLabel.setLabelFor(minuteEditText.getId());
+      hourLabel.setLabelFor(hourEditText.getId());
+    }
+
     controller = new TimePickerTextInputKeyController(hourTextInput, minuteTextInput, time);
+    hourTextInput.setChipDelegate(
+        new ClickActionDelegate(timePickerView.getContext(), R.string.material_hour_selection));
+    minuteTextInput.setChipDelegate(
+        new ClickActionDelegate(timePickerView.getContext(), R.string.material_minute_selection));
 
     initialize();
   }