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

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

Merge "Debounce volume updates in the dialog" into main

parents 9ef40417 8d753ef4

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/VolumeDialogControllerImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ public class VolumeDialogControllerImplTest extends SysuiTestCase { 
    @Test

    public void testSetStreamVolume_setSecondaryDeviceVolume() {

        mVolumeController.setStreamVolume(

                VolumeDialogControllerImpl.DYNAMIC_STREAM_BROADCAST, /* level= */ 100);

                VolumeDialogControllerImpl.DYNAMIC_STREAM_BROADCAST, /* level= */ 100, false);

        Objects.requireNonNull(TestableLooper.get(this)).processAllMessages();

        mTestScope.getTestScheduler().advanceUntilIdle();

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class VolumeDialogStateInteractorTest : SysuiTestCase() { 
    fun dialogState_collectedEagerly() =

        kosmos.runTest {

            val nonDefaultActiveStream = 123

            fakeVolumeDialogController.setActiveStream(123)

            fakeVolumeDialogController.setActiveStream(123, true)



            val volumeDialogStateModel by collectLastValue(underTest.volumeDialogState)

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/dialog/ringer/domain/VolumeDialogRingerInteractorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class VolumeDialogRingerInteractorTest : SysuiTestCase() { 
    @Before

    fun setUp() {

        underTest = kosmos.volumeDialogRingerInteractor

        controller.setStreamVolume(STREAM_RING, 50)

        controller.setStreamVolume(STREAM_RING, 50, true)

    }



    @Test

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/dialog/ringer/ui/viewmodel/VolumeDialogRingerDrawerViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ class VolumeDialogRingerDrawerViewModelTest : SysuiTestCase() { 
    }



    private fun TestScope.setUpRingerMode(selectedRingerMode: RingerMode) {

        controller.setStreamVolume(STREAM_RING, 50)

        controller.setStreamVolume(STREAM_RING, 50, true)

        controller.setRingerMode(selectedRingerMode.value, false)

        runCurrent()

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class VolumeDialogSliderInteractorTest : SysuiTestCase() { 
    fun settingStreamVolume_setsActiveStream() =

        kosmos.runTest {

            // initialize the stream model

            fakeVolumeDialogController.setStreamVolume(volumeDialogSliderType.audioStream, 0)

            fakeVolumeDialogController.setStreamVolume(volumeDialogSliderType.audioStream, 0, true)



            val sliderModel by collectLastValue(underTest.slider)

            underTest.setStreamVolume(1)