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

Commit 19f49dd4 authored by Alex Shabalin's avatar Alex Shabalin
Browse files

Fix group playback volume slider. 

Fixing the flag condition error introduced in ag/34162728.

Bug: 434043966
Test: On a physical device.
Flag: EXEMPT bugfix
Change-Id: I0683a847a2bbe5c6770dead52576e663502361a6
parent 549792f1

packages/SystemUI/multivalentTests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -688,9 +688,11 @@ class MediaOutputAdapterTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_OUTPUT_SWITCHER_PERSONAL_AUDIO_SHARING)

    fun multipleSelectedDevices_listCollapsed_verifySessionControl() {

        mMediaSwitchingController.stub {

            on { isGroupListCollapsed } doReturn true

            // TODO: remove once FLAG_ENABLE_OUTPUT_SWITCHER_PERSONAL_AUDIO_SHARING is cleaned up.

            on { isVolumeControlEnabledForSession } doReturn true

        }

        initializeSession()
@@ -700,6 +702,7 @@ class MediaOutputAdapterTest : SysuiTestCase() { 
            assertThat(mSlider.visibility).isEqualTo(VISIBLE)

            assertThat(mTitleText.visibility).isEqualTo(VISIBLE)

            assertThat(mSlider.value).isEqualTo(TEST_CURRENT_VOLUME)

            assertThat(mSlider.isEnabled).isTrue()

        }



        val viewHolder =

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.kt

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ class MediaOutputAdapter(controller: MediaSwitchingController) : 
                // casting devices without group volume control, so disabling seek bar will be

                // unnecessary when Flags.enableOutputSwitcherPersonalAudioSharing() is on.

                isVolumeControlAllowed =

                    !Flags.enableOutputSwitcherPersonalAudioSharing() &&

                    Flags.enableOutputSwitcherPersonalAudioSharing() ||

                        mController.isVolumeControlEnabledForSession,

                currentVolume = mController.sessionVolume,

                maxVolume = mController.sessionVolumeMax,