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

Commit eab0afd9 authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Fix privacy dot not removed issue" into udc-dev am: a82a21c0 am: 951b5643 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23515739



Change-Id: I2c816f29782efcb6dc322c3e96b9198443bf178e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea16a395 951b5643

packages/SystemUI/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImpl.kt

+3 −1
Original line number Diff line number Diff line
@@ -188,7 +188,9 @@ constructor( 
        if (animationState.value == ANIMATING_OUT) {

            coroutineScope.launch {

                withTimeout(DISAPPEAR_ANIMATION_DURATION) {

                    animationState.first { it == SHOWING_PERSISTENT_DOT || it == ANIMATION_QUEUED }

                    animationState.first {

                        it == SHOWING_PERSISTENT_DOT || it == IDLE || it == ANIMATION_QUEUED

                    }

                    notifyHidePersistentDot()

                }

            }

packages/SystemUI/tests/src/com/android/systemui/statusbar/events/SystemStatusAnimationSchedulerImplTest.kt

+30 −0
Original line number Diff line number Diff line
@@ -60,9 +60,13 @@ import org.mockito.MockitoAnnotations 
class SystemStatusAnimationSchedulerImplTest : SysuiTestCase() {



    @Mock private lateinit var systemEventCoordinator: SystemEventCoordinator



    @Mock private lateinit var statusBarWindowController: StatusBarWindowController



    @Mock private lateinit var statusBarContentInsetProvider: StatusBarContentInsetsProvider



    @Mock private lateinit var dumpManager: DumpManager



    @Mock private lateinit var listener: SystemStatusAnimationCallback



    private lateinit var systemClock: FakeSystemClock
@@ -379,6 +383,32 @@ class SystemStatusAnimationSchedulerImplTest : SysuiTestCase() { 
        verify(listener, never()).onHidePersistentDot()

    }



    @Test

    fun testPrivacyDot_isRemovedDuringChipDisappearAnimation() = runTest {

        // Instantiate class under test with TestScope from runTest

        initializeSystemStatusAnimationScheduler(testScope = this)



        // create and schedule high priority event

        createAndScheduleFakePrivacyEvent()



        // fast forward to ANIMATING_OUT state

        fastForwardAnimationToState(ANIMATING_OUT)

        assertEquals(ANIMATING_OUT, systemStatusAnimationScheduler.getAnimationState())

        verify(listener, times(1)).onSystemStatusAnimationTransitionToPersistentDot(any())



        // remove persistent dot

        systemStatusAnimationScheduler.removePersistentDot()

        testScheduler.runCurrent()



        // skip disappear animation

        animatorTestRule.advanceTimeBy(DISAPPEAR_ANIMATION_DURATION)

        testScheduler.runCurrent()



        // verify that animationState changes to IDLE and onHidePersistentDot callback is invoked

        assertEquals(IDLE, systemStatusAnimationScheduler.getAnimationState())

        verify(listener, times(1)).onHidePersistentDot()

    }



    @Test

    fun testPrivacyEvent_forceVisibleIsUpdated_whenRescheduledDuringQueuedState() = runTest {

        // Instantiate class under test with TestScope from runTest