From 78367de795be151cf38626491d6579813aa0ae53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Hern=C3=A1ndez?= Date: Mon, 30 Sep 2024 17:47:36 +0200 Subject: [PATCH] Fix a11y readout of the day toggles in Time Schedule of Modes Content description (full day name) replaces TextOn/TextOff (day name initial), and the state description no longer has the day name. As a result: * the initial readout changes from "Monday, off, M, Switch" to "Off, Monday, Switch" * when toggling, the name of the day is no longer repeated, and just "On/Off" is announced. Fixes: 370360007 Test: manual, with Talkback Flag: android.app.modes_ui Change-Id: I57bbd7034e1af2836582720a7f4871a79d6644ab --- .../modes/ZenModeSetSchedulePreferenceController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java b/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java index e4c3f32e3db..d6b2f0117b9 100644 --- a/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java +++ b/src/com/android/settings/notification/modes/ZenModeSetSchedulePreferenceController.java @@ -204,10 +204,10 @@ class ZenModeSetSchedulePreferenceController extends AbstractZenModePreferenceCo // day label. dayToggle.setTextOn(mShortDayFormat.format(c.getTime())); dayToggle.setTextOff(mShortDayFormat.format(c.getTime())); - String state = dayEnabled - ? mContext.getString(com.android.internal.R.string.capital_on) - : mContext.getString(com.android.internal.R.string.capital_off); - dayToggle.setStateDescription(mLongDayFormat.format(c.getTime()) + ", " + state); + dayToggle.setContentDescription(mLongDayFormat.format(c.getTime())); + dayToggle.setStateDescription(mContext.getString(dayEnabled + ? com.android.internal.R.string.capital_on + : com.android.internal.R.string.capital_off)); dayToggle.setChecked(dayEnabled); dayToggle.setOnCheckedChangeListener((buttonView, isChecked) -> {