Skip to content

Commit 787ad71

Browse files
Material Design Teamhunterstich
authored andcommitted
[Date Picker][A11y] Replace deprecated announcement API with accessibility pane title
PiperOrigin-RevId: 771083111
1 parent 6d8d750 commit 787ad71

File tree

83 files changed

+18
-168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+18
-168
lines changed

lib/java/com/google/android/material/datepicker/MaterialCalendar.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ public void onDayClick(long day) {
251251
}
252252
recyclerView.scrollToPosition(monthsPagerAdapter.getPosition(current));
253253
setUpForAccessibility();
254+
updateAccessibilityPaneTitle(root);
254255
return root;
255256
}
256257

@@ -415,12 +416,23 @@ void sendAccessibilityFocusEventToMonthDropdown() {
415416
void toggleVisibleSelector() {
416417
if (calendarSelector == CalendarSelector.YEAR) {
417418
setSelector(CalendarSelector.DAY);
418-
recyclerView.announceForAccessibility(
419-
getString(R.string.mtrl_picker_toggled_to_day_selection));
420419
} else if (calendarSelector == CalendarSelector.DAY) {
421420
setSelector(CalendarSelector.YEAR);
422-
yearSelector.announceForAccessibility(
423-
getString(R.string.mtrl_picker_toggled_to_year_selection));
421+
}
422+
updateAccessibilityPaneTitle(getView());
423+
}
424+
425+
private void updateAccessibilityPaneTitle(@Nullable View view) {
426+
if (view == null) {
427+
return;
428+
}
429+
430+
if (calendarSelector == CalendarSelector.YEAR) {
431+
ViewCompat.setAccessibilityPaneTitle(
432+
view, getString(R.string.mtrl_picker_pane_title_year_view));
433+
} else if (calendarSelector == CalendarSelector.DAY) {
434+
ViewCompat.setAccessibilityPaneTitle(
435+
view, getString(R.string.mtrl_picker_pane_title_calendar_view));
424436
}
425437
}
426438

lib/java/com/google/android/material/datepicker/res/values-af/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<string name="mtrl_picker_a11y_next_month">Verander na volgende maand</string>
4444
<string name="mtrl_picker_toggle_to_year_selection">Skakel oor na jaaraansig</string>
4545
<string name="mtrl_picker_toggle_to_day_selection">Skakel oor na kalenderaansig</string>
46-
<string name="mtrl_picker_toggled_to_year_selection">Oorgeskakel na jaaraansig</string>
47-
<string name="mtrl_picker_toggled_to_day_selection">Oorgeskakel na kalenderaansig</string>
4846
<string name="mtrl_picker_day_of_week_column_header">%1$s</string>
4947
<string name="mtrl_picker_announce_current_selection">Huidige keuse: %1$s</string>
5048
<string name="mtrl_picker_announce_current_range_selection">Keuse van begindatum: %1$s – Keuse van einddatum: %2$s</string>

lib/java/com/google/android/material/datepicker/res/values-am/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<string name="mtrl_picker_a11y_next_month">ወደ የሚቀጥለው ወር ቀይር</string>
4444
<string name="mtrl_picker_toggle_to_year_selection">ወደ ዓመት ዕይታ ቀይር</string>
4545
<string name="mtrl_picker_toggle_to_day_selection">ወደ ቀን መቁጠሪያ ዕይታ ቀይር</string>
46-
<string name="mtrl_picker_toggled_to_year_selection">ወደ ዓመት ዕይታ ተቀይሯል</string>
47-
<string name="mtrl_picker_toggled_to_day_selection">ወደ ቀን መቁጠሪያ ዕይታ ተቀይሯል</string>
4846
<string name="mtrl_picker_day_of_week_column_header">%1$s</string>
4947
<string name="mtrl_picker_announce_current_selection">የአሁኑ ምርጫ፦ %1$s</string>
5048
<string name="mtrl_picker_announce_current_range_selection">የመጀመሪያ ቀን ምርጫ፦ %1$s – የማብቂያ ቀን ምርጫ፦ %2$s</string>

lib/java/com/google/android/material/datepicker/res/values-ar/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<string name="mtrl_picker_a11y_next_month">التغيير إلى الشهر التالي</string>
4444
<string name="mtrl_picker_toggle_to_year_selection">التبديل إلى العرض حسب السنة</string>
4545
<string name="mtrl_picker_toggle_to_day_selection">التبديل إلى عرض \"تقويم Google\"</string>
46-
<string name="mtrl_picker_toggled_to_year_selection">تم التبديل إلى عرض اختيار السنة</string>
47-
<string name="mtrl_picker_toggled_to_day_selection">تم التبديل إلى عرض التقويم</string>
4846
<string name="mtrl_picker_day_of_week_column_header">%1$s</string>
4947
<string name="mtrl_picker_announce_current_selection">الاختيار الحالي: %1$s</string>
5048
<string name="mtrl_picker_announce_current_range_selection">اختيار تاريخ البدء: %1$s – اختيار تاريخ الانتهاء: %2$s</string>

lib/java/com/google/android/material/datepicker/res/values-as/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<string name="mtrl_picker_a11y_next_month">Change to next month</string>
4444
<string name="mtrl_picker_toggle_to_year_selection">Switch to year view</string>
4545
<string name="mtrl_picker_toggle_to_day_selection">Switch to Calendar view</string>
46-
<string name="mtrl_picker_toggled_to_year_selection">Switched to year view</string>
47-
<string name="mtrl_picker_toggled_to_day_selection">Switched to Calendar view</string>
4846
<string name="mtrl_picker_day_of_week_column_header">%1$s</string>
4947
<string name="mtrl_picker_announce_current_selection">Current selection: %1$s</string>
5048
<string name="mtrl_picker_announce_current_range_selection">Start date selection: %1$s – End date selection: %2$s</string>

lib/java/com/google/android/material/datepicker/res/values-az/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<string name="mtrl_picker_a11y_next_month">Növbəti aya dəyişin</string>
4444
<string name="mtrl_picker_toggle_to_year_selection">İl görünüşünə dəyişin</string>
4545
<string name="mtrl_picker_toggle_to_day_selection">Təqvim görünüşünə dəyişin</string>
46-
<string name="mtrl_picker_toggled_to_year_selection">İl görünüşünə keçildi</string>
47-
<string name="mtrl_picker_toggled_to_day_selection">Təqvim görünüşünə keçildi</string>
4846
<string name="mtrl_picker_day_of_week_column_header">%1$s</string>
4947
<string name="mtrl_picker_announce_current_selection">Cari seçim: %1$s</string>
5048
<string name="mtrl_picker_announce_current_range_selection">Başlama tarixi seçimi: %1$s – Bitmə tarixi seçimi: %2$s</string>

lib/java/com/google/android/material/datepicker/res/values-b+es+419/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<string name="mtrl_picker_a11y_next_month">Cambiar al mes siguiente</string>
4444
<string name="mtrl_picker_toggle_to_year_selection">Cambiar a la vista anual</string>
4545
<string name="mtrl_picker_toggle_to_day_selection">Cambiar a la vista de Calendario</string>
46-
<string name="mtrl_picker_toggled_to_year_selection">Se cambió a la vista de año</string>
47-
<string name="mtrl_picker_toggled_to_day_selection">Se cambió a la vista de Calendario</string>
4846
<string name="mtrl_picker_day_of_week_column_header">%1$s</string>
4947
<string name="mtrl_picker_announce_current_selection">Selección actual: %1$s</string>
5048
<string name="mtrl_picker_announce_current_range_selection">Selección de fecha de inicio: %1$s – Selección de fecha de finalización: %2$s</string>

lib/java/com/google/android/material/datepicker/res/values-b+sr+Latn/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<string name="mtrl_picker_a11y_next_month">Pređite na sledeći mesec</string>
4444
<string name="mtrl_picker_toggle_to_year_selection">Pređite na prikaz godine</string>
4545
<string name="mtrl_picker_toggle_to_day_selection">Pređite na prikaz kalendara</string>
46-
<string name="mtrl_picker_toggled_to_year_selection">Prešli ste na prikaz godine</string>
47-
<string name="mtrl_picker_toggled_to_day_selection">Prešli ste na prikaz kalendara</string>
4846
<string name="mtrl_picker_day_of_week_column_header">%1$s</string>
4947
<string name="mtrl_picker_announce_current_selection">Aktuelni izbor: %1$s</string>
5048
<string name="mtrl_picker_announce_current_range_selection">Izbor datuma početka: %1$s – Izbor datuma završetka: %2$s</string>

lib/java/com/google/android/material/datepicker/res/values-be/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<string name="mtrl_picker_a11y_next_month">Перайсці да наступнага месяца</string>
4444
<string name="mtrl_picker_toggle_to_year_selection">Пераключыцца на рэжым прагляду гадоў</string>
4545
<string name="mtrl_picker_toggle_to_day_selection">Пераключыцца на рэжым прагляду \"Каляндар\"</string>
46-
<string name="mtrl_picker_toggled_to_year_selection">Вы пераключыліся на агляд года</string>
47-
<string name="mtrl_picker_toggled_to_day_selection">Вы пераключыліся на прагляд календара</string>
4846
<string name="mtrl_picker_day_of_week_column_header">%1$s</string>
4947
<string name="mtrl_picker_announce_current_selection">Бягучае вылучэнне: %1$s</string>
5048
<string name="mtrl_picker_announce_current_range_selection">Выбраная дата пачатку: %1$s – Выбраная дата заканчэння: %2$s</string>

lib/java/com/google/android/material/datepicker/res/values-bg/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
<string name="mtrl_picker_a11y_next_month">Преминаване към следващия месец</string>
4444
<string name="mtrl_picker_toggle_to_year_selection">Превключване към годишен изглед</string>
4545
<string name="mtrl_picker_toggle_to_day_selection">Превключване към изглед в календара</string>
46-
<string name="mtrl_picker_toggled_to_year_selection">Превключихте към годишен изглед</string>
47-
<string name="mtrl_picker_toggled_to_day_selection">Превключихте към изглед в календара</string>
4846
<string name="mtrl_picker_day_of_week_column_header">%1$s</string>
4947
<string name="mtrl_picker_announce_current_selection">Текущ избор: %1$s</string>
5048
<string name="mtrl_picker_announce_current_range_selection">Избиране на начална дата: %1$s – Избиране на крайна дата: %2$s</string>

0 commit comments

Comments
 (0)