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

Commit 95adad79 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

[conflict] Merge "Reset isFoldHandled" into tm-qpr-dev am: d926222a am: 157ea6d3 am: b50d146e 

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



Change-Id: I662d1652691fc2562f883444a5234eb0b2048a57
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ed5e23e b50d146e

packages/SystemUI/src/com/android/systemui/unfold/FoldAodAnimationController.kt

+5 −2
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ constructor( 
        } else if (isFolded && !isFoldHandled && alwaysOnEnabled && isDozing) {

            // Screen turning on for the first time after folding and we are already dozing

            // We should play the folding to AOD animation

            isFoldHandled = true



            setAnimationState(playing = true)

            getShadeFoldAnimator().prepareFoldToAodAnimation()
@@ -190,8 +191,10 @@ constructor( 
            cancelAnimation?.run()



            // Post starting the animation to the next frame to avoid junk due to inset changes

            cancelAnimation =

                mainExecutor.executeDelayed(startAnimationRunnable, /* delayMillis= */ 0)

            cancelAnimation = mainExecutor.executeDelayed(

                startAnimationRunnable,

                /* delayMillis= */ 0

            )

            shouldPlayAnimation = false

        }

    }

packages/SystemUI/tests/src/com/android/systemui/unfold/FoldAodAnimationControllerTest.kt

+24 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ import org.junit.runner.RunWith 
import org.mockito.ArgumentCaptor

import org.mockito.Captor

import org.mockito.Mock

import org.mockito.Mockito.never

import org.mockito.Mockito.reset

import org.mockito.Mockito.verify

import org.mockito.Mockito.verifyNoMoreInteractions

import org.mockito.Mockito.`when` as whenever
@@ -176,6 +178,28 @@ class FoldAodAnimationControllerTest : SysuiTestCase() { 
            job.cancel()

        }



    @Test

    fun onFolded_onScreenTurningOnInvokedTwice_doesNotLogLatency() =

        runBlocking(IMMEDIATE) {

            val job = underTest.listenForDozing(this)

            keyguardRepository.setDozing(true)

            setAodEnabled(enabled = true)



            yield()



            fold()

            simulateScreenTurningOn()

            reset(latencyTracker)



            // This can happen > 1 time if the prox sensor is covered

            simulateScreenTurningOn()



            verify(latencyTracker, never()).onActionStart(any())

            verify(latencyTracker, never()).onActionEnd(any())



            job.cancel()

        }



    @Test

    fun onFolded_animationCancelled_doesNotLogLatency() =

        runBlocking(IMMEDIATE) {