From 5b78bf48964a5a398c9953988908a54c49c199eb Mon Sep 17 00:00:00 2001
From: pfthomas <pfthomas@google.com>
Date: Wed, 20 Apr 2022 09:45:21 -0400
Subject: [PATCH] [MaterialTimePicker][a11y] Fix label for hour/minute
 EditTexts.

PiperOrigin-RevId: 443080572
---
 .../material/timepicker/ChipTextInputComboView.java      | 2 ++
 .../timepicker/res/layout/material_time_input.xml        | 9 ++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/java/com/google/android/material/timepicker/ChipTextInputComboView.java b/lib/java/com/google/android/material/timepicker/ChipTextInputComboView.java
index 7a3ecf84de3..506b2f1efef 100644
--- a/lib/java/com/google/android/material/timepicker/ChipTextInputComboView.java
+++ b/lib/java/com/google/android/material/timepicker/ChipTextInputComboView.java
@@ -80,6 +80,8 @@ public ChipTextInputComboView(
     addView(chip);
     addView(textInputLayout);
     label = findViewById(R.id.material_label);
+    editText.setId(ViewCompat.generateViewId());
+    ViewCompat.setLabelFor(label, editText.getId());
     editText.setSaveEnabled(false);
     editText.setLongClickable(false);
   }
diff --git a/lib/java/com/google/android/material/timepicker/res/layout/material_time_input.xml b/lib/java/com/google/android/material/timepicker/res/layout/material_time_input.xml
index 3d13b14b4d4..39c339a0352 100644
--- a/lib/java/com/google/android/material/timepicker/res/layout/material_time_input.xml
+++ b/lib/java/com/google/android/material/timepicker/res/layout/material_time_input.xml
@@ -17,7 +17,6 @@
 
 <com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   app:errorIconDrawable="@null"
@@ -26,19 +25,15 @@
   app:shapeAppearanceOverlay="@null">
 
   <com.google.android.material.textfield.TextInputEditText
-    android:id="@+id/material_timepicker_edit_text"
     android:layout_width="96dp"
     android:textCursorDrawable="@drawable/material_cursor_drawable"
     android:layout_height="80dp"
-    android:paddingBottom="6dp"
-    tools:ignore="LabelFor" />
+    android:paddingBottom="6dp" />
 
   <TextView
-    android:labelFor="@+id/material_timepicker_edit_text"
     android:id="@+id/material_label"
     android:focusable="false"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    tools:ignore="LabelFor" />
+    android:layout_height="wrap_content" />
 
 </com.google.android.material.textfield.TextInputLayout>