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

Commit 96aaafe6 authored by Anton Potapov's avatar Anton Potapov
Browse files

Fix preserving currently visible slider 

Flag: com.android.systemui.volume_redesign
Bug: 369994956
Test: atest VolumeDialogSlidersInteractorTest
Test: manual on the tablet. Join the call to force the dialog to show
media and call sliders at the same time. Adjust any volume.

Change-Id: Ib6445bd8e02abab9974d1478a8e38c2342faaf58
parent 559895c2

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/dialog/sliders/domain/interactor/VolumeDialogSlidersInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -172,9 +172,9 @@ class VolumeDialogSlidersInteractorTest : SysuiTestCase() { 
                runCurrent()



                assertThat(slidersModel!!.slider)

                    .isEqualTo(VolumeDialogSliderType.Stream(AudioManager.STREAM_MUSIC))

                    .isEqualTo(VolumeDialogSliderType.Stream(AudioManager.STREAM_SYSTEM))

                assertThat(slidersModel!!.floatingSliders)

                    .containsExactly(VolumeDialogSliderType.Stream(AudioManager.STREAM_SYSTEM))

                    .containsExactly(VolumeDialogSliderType.Stream(AudioManager.STREAM_MUSIC))

            }

        }

    }

packages/SystemUI/src/com/android/systemui/volume/dialog/sliders/domain/interactor/VolumeDialogSlidersInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ constructor( 
                LinkedHashSet(sliderTypes)

            }

            .runningReduce { sliderTypes, newSliderTypes ->

                newSliderTypes.apply { addAll(sliderTypes) }

                sliderTypes.apply { addAll(newSliderTypes) }

            }

            .map { sliderTypes ->

                VolumeDialogSlidersModel(