diff options
| author | 2024-04-12 16:34:46 +0000 | |
|---|---|---|
| committer | 2024-04-12 16:34:46 +0000 | |
| commit | c96af15bc16bd179e8a290ffa207ce6739c28f12 (patch) | |
| tree | 2c04bb1970946ee6d6de095e605a9afb7748195d | |
| parent | 993720fe40fd4a6b343d8a667b10c64d2fe49b24 (diff) | |
| parent | 06f44a6dd4ce5964cc9dfafaf4bdd677f8ba4bc0 (diff) | |
Merge "Add disabledMessage to the VolumeSlider contentDescription" into main
| -rw-r--r-- | packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt | 3 |
1 files changed, 2 insertions, 1 deletions
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 228d29259038..9f5ab3c0e284 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 @@ -61,7 +61,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. |