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

Commit b0d4eda1 authored by rashipatil's avatar rashipatil
Browse files

Remove Redundant calls to onCarouselVisibleToUser 

Bug: 419892165, 428168381
Test: unit tests
Flag: com.android.systemui.enable_suggested_device_ui
Change-Id: Ie6e86c1278ce9bc7f0b179cfd345e53da08f5d2c
parent c7273ac9

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManager.kt

+5 −1
Original line number Diff line number Diff line
@@ -266,6 +266,9 @@ constructor( 
    private var hasActiveMedia: Boolean = false

        get() = mediaManager.hasActiveMedia()



    /** Previous value of carouselVisible */

    private var previousCarouselVisible = false



    /** Are we currently waiting on an animation to start? */

    private var animationPending: Boolean = false

    private val startAnimation: Runnable = Runnable { animator.start() }
@@ -1347,9 +1350,10 @@ constructor( 
        logger.logUserVisibilityChange(shadeVisible, mediaVisible)

        val carouselVisible = shadeVisible && mediaVisible

        mediaCarouselController.mediaCarouselScrollHandler.visibleToUser = carouselVisible

        if (carouselVisible) {

        if (carouselVisible && !previousCarouselVisible) {

            mediaCarouselController.onCarouselVisibleToUser()

        }

        previousCarouselVisible = carouselVisible

    }



    private fun isLockScreenVisibleToUser(): Boolean {

packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaHierarchyManagerTest.kt

+11 −3
Original line number Diff line number Diff line
@@ -812,7 +812,6 @@ class MediaHierarchyManagerTest : SysuiTestCase() { 
                testScope = testScope,

            )

            goToLockedShade()

            clearInvocations(mediaCarouselController)



            statusBarCallback.value.onStateChanged(StatusBarState.SHADE_LOCKED)
@@ -828,7 +827,6 @@ class MediaHierarchyManagerTest : SysuiTestCase() { 
                testScope = testScope,

            )

            goToLockedShade()

            clearInvocations(mediaCarouselController)



            statusBarCallback.value.onDozingChanged(false)
@@ -836,7 +834,7 @@ class MediaHierarchyManagerTest : SysuiTestCase() { 
        }



    @Test

    fun testStatusBarOnExpandedChanged_carouselVisibleToUser() {

    fun testStatusBarOnExpandedChangedToTrue_carouselVisibleToUser() {

        setHomeScreenShadeVisibleToUser()



        statusBarCallback.value.onExpandedChanged(true)
@@ -844,6 +842,16 @@ class MediaHierarchyManagerTest : SysuiTestCase() { 
        verify(mediaCarouselController).onCarouselVisibleToUser()

    }



    @Test

    fun testStatusBarOnExpandedChangedToFalse_carouselVisibleToUser() {

        setHomeScreenShadeVisibleToUser()



        statusBarCallback.value.onExpandedChanged(true)

        statusBarCallback.value.onExpandedChanged(false)



        verify(mediaCarouselController, times(1)).onCarouselVisibleToUser()

    }



    private fun setHomeScreenShadeVisibleToUser() {

        whenever(statusBarStateController.isDozing).thenReturn(false)

        whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE)