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

Commit 8d9f0299 authored by Anton Potapov's avatar Anton Potapov
Browse files

Remove a11y actions for unmutable streams 

Flag: com.android.systemui.new_volume_panel
Fixes: 340439987
Test: manual on the phone with Switch access
Change-Id: I066315068155f42be824f17b8e0b4ba2e4fa7d7c
parent 7f1b8edc

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt

+1 −3
Original line number Diff line number Diff line
@@ -68,9 +68,7 @@ fun VolumeSlider( 
                    state.a11yClickDescription?.let {

                        customActions =

                            listOf(

                                CustomAccessibilityAction(

                                    it,

                                ) {

                                CustomAccessibilityAction(it) {

                                    onIconTapped()

                                    true

                                }

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

+12 −8
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ constructor( 
            isEnabled = isEnabled,

            a11yStep = volumeRange.step,

            a11yClickDescription =

                if (isAffectedByMute) {

                    context.getString(

                        if (isMuted) {

                            R.string.volume_panel_hint_unmute
@@ -153,7 +154,10 @@ constructor( 
                            R.string.volume_panel_hint_mute

                        },

                        label,

                ),

                    )

                } else {

                    null

                },

            a11yStateDescription =

                if (volume == volumeRange.first) {

                    context.getString(