Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60532c75 authored by Anton Potapov's avatar Anton Potapov
Browse files

Make voiceover desciription dependant on the isMuted flag 

Flag: EXEMPT BUGFIX
Fixes: 386908086
Test: manual on phone. Go through the volume sliders in the Volume Panel
Test: atest VolumePanelScreenshotTest
Change-Id: Iced5889ae462ecdda433eb9bd850b0729fa95aa0
parent 8ee235ee

packages/SystemUI/src/com/android/systemui/volume/panel/component/volume/slider/ui/viewmodel/AudioStreamSliderViewModel.kt

+4 −6
Original line number Diff line number Diff line
@@ -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 {