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

Commit 6cc1b209 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Dual Shade] Show UMO in QS when media is not active, and add tests." into main

parents bf9f5e00 eadb5ac3

packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModelTest.kt

+11 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ class NotificationsShadeOverlayContentViewModelTest : SysuiTestCase() { 
        }



    @Test

    fun showMedia_noActiveMedia_false() =

    fun showMedia_InactiveMedia_false() =

        testScope.runTest {

            kosmos.mediaFilterRepository.addSelectedUserMediaEntry(MediaData(active = false))

            runCurrent()
@@ -165,6 +165,16 @@ class NotificationsShadeOverlayContentViewModelTest : SysuiTestCase() { 
            assertThat(underTest.showMedia).isFalse()

        }



    @Test

    fun showMedia_noMedia_false() =

        testScope.runTest {

            kosmos.mediaFilterRepository.addSelectedUserMediaEntry(MediaData(active = true))

            kosmos.mediaFilterRepository.clearSelectedUserMedia()

            runCurrent()



            assertThat(underTest.showMedia).isFalse()

        }



    @Test

    fun showMedia_qsDisabled_false() =

        testScope.runTest {

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsContainerViewModelTest.kt

+11 −1
Original line number Diff line number Diff line
@@ -95,11 +95,21 @@ class QuickSettingsContainerViewModelTest : SysuiTestCase() { 
        }



    @Test

    fun showMedia_noActiveMedia_false() =

    fun showMedia_InactiveMedia_true() =

        testScope.runTest {

            kosmos.mediaFilterRepository.addSelectedUserMediaEntry(MediaData(active = false))

            runCurrent()



            assertThat(underTest.showMedia).isTrue()

        }



    @Test

    fun showMedia_noMedia_false() =

        testScope.runTest {

            kosmos.mediaFilterRepository.addSelectedUserMediaEntry(MediaData(active = true))

            kosmos.mediaFilterRepository.clearSelectedUserMedia()

            runCurrent()



            assertThat(underTest.showMedia).isFalse()

        }

}

packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsContainerViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ constructor( 
    val showMedia: Boolean by

        hydrator.hydratedStateOf(

            traceName = "showMedia",

            source = mediaCarouselInteractor.hasActiveMediaOrRecommendation,

            source = mediaCarouselInteractor.hasAnyMediaOrRecommendation,

        )



    override suspend fun onActivated(): Nothing {