From 06f44a6dd4ce5964cc9dfafaf4bdd677f8ba4bc0 Mon Sep 17 00:00:00 2001 From: Anton Potapov Date: Thu, 11 Apr 2024 15:04:42 +0100 Subject: Add disabledMessage to the VolumeSlider contentDescription Flag: aconfig new_volume_panel TEAMFOOD Test: manual on the phone with the voiceover turned on Fixes: 331873535 Change-Id: I8d142904cb83103d0ad843d39c99be1ef64a1cba --- .../volume/panel/component/volume/ui/composable/VolumeSlider.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt index 19d3f599ef31..9ea8bd728742 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt @@ -58,7 +58,8 @@ fun VolumeSlider( modifier = modifier.clearAndSetSemantics { if (!state.isEnabled) disabled() - contentDescription = state.label + contentDescription = + state.disabledMessage?.let { "${state.label}, $it" } ?: state.label // provide a not animated value to the a11y because it fails to announce the // settled value when it changes rapidly. -- cgit v1.2.3-59-g8ed1b