Merge "Make voiceover desciription dependant on the isMuted flag" into main

1 files changed, 4 insertions, 6 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt
index 5b8d9b045475..328d1245e4a5 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt
@@ -65,8 +65,6 @@ constructor(
 ) : SliderViewModel {
 
     private val volumeChanges = MutableStateFlow<Int?>(null)
-    private val streamsAffectedByRing =
-        setOf(AudioManager.STREAM_RING, AudioManager.STREAM_NOTIFICATION)
     private val audioStream = audioStreamWrapper.audioStream
     private val iconsByStream =
         mapOf(
@@ -175,9 +173,9 @@ constructor(
                     null
                 },
             a11yStateDescription =
-                if (volume == volumeRange.first) {
+                if (isMuted) {
                     context.getString(
-                        if (audioStream.value in streamsAffectedByRing) {
+                        if (isAffectedByRingerMode) {
                             if (ringerMode.value == AudioManager.RINGER_MODE_VIBRATE) {
                                 R.string.volume_panel_hint_vibrate
                             } else {
@@ -226,8 +224,8 @@ constructor(
 
     private fun AudioStreamModel.getIcon(ringerMode: RingerMode): Icon {
         val iconRes =
-            if (isAffectedByMute && isMuted) {
-                if (audioStream.value in streamsAffectedByRing) {
+            if (isMuted) {
+                if (isAffectedByRingerMode) {
                     if (ringerMode.value == AudioManager.RINGER_MODE_VIBRATE) {
                         R.drawable.ic_volume_ringer_vibrate
                     } else {