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

Commit d92f5ce5 authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Fix preserving currently visible slider" into main

parents caa93d6c 96aaafe6

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(