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

Commit d707fcf7 authored by Matt Pietal's avatar Matt Pietal
Browse files

Transitions - Handle cancel of bouncer swipe 

When swipe up is followed by a swipe down, issue a call to cancel the
current transition and then immediately go back to the prior
state. This was impacting dream transitions.

Test: atest KeyguardTransitionRepositoryTest
Bug: 260637747
Change-Id: I6509e0377e58971c09ddd0ee971c31fce615e542
parent e71e3427

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -209,7 +209,7 @@ class KeyguardTransitionRepositoryImpl @Inject constructor() : KeyguardTransitio 
            return

            return

        }

        }





        if (state == TransitionState.FINISHED) {

        if (state == TransitionState.FINISHED || state == TransitionState.CANCELED) {

            updateTransitionId = null

            updateTransitionId = null

        }

        }

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/FromLockscreenTransitionInteractor.kt

+30 −13
Original line number Original line Diff line number Diff line
@@ -48,8 +48,6 @@ constructor( 
    private val keyguardTransitionRepository: KeyguardTransitionRepository,

    private val keyguardTransitionRepository: KeyguardTransitionRepository,

) : TransitionInteractor(FromLockscreenTransitionInteractor::class.simpleName!!) {

) : TransitionInteractor(FromLockscreenTransitionInteractor::class.simpleName!!) {





    private var transitionId: UUID? = null



    override fun start() {

    override fun start() {

        listenForLockscreenToGone()

        listenForLockscreenToGone()

        listenForLockscreenToOccluded()

        listenForLockscreenToOccluded()
@@ -104,6 +102,7 @@ constructor( 




    /* Starts transitions when manually dragging up the bouncer from the lockscreen. */

    /* Starts transitions when manually dragging up the bouncer from the lockscreen. */

    private fun listenForLockscreenToBouncerDragging() {

    private fun listenForLockscreenToBouncerDragging() {

        var transitionId: UUID? = null

        scope.launch {

        scope.launch {

            shadeRepository.shadeModel

            shadeRepository.shadeModel

                .sample(

                .sample(
@@ -114,25 +113,43 @@ constructor( 
                    ),

                    ),

                    ::toTriple

                    ::toTriple

                )

                )

                .collect { triple ->

                .collect { (shadeModel, keyguardState, statusBarState) ->

                    val (shadeModel, keyguardState, statusBarState) = triple



                    val id = transitionId

                    val id = transitionId

                    if (id != null) {

                    if (id != null) {

                        // An existing `id` means a transition is started, and calls to

                        // An existing `id` means a transition is started, and calls to

                        // `updateTransition` will control it until FINISHED

                        // `updateTransition` will control it until FINISHED or CANCELED

                        var nextState =

                            if (shadeModel.expansionAmount == 0f) {

                                TransitionState.FINISHED

                            } else if (shadeModel.expansionAmount == 1f) {

                                TransitionState.CANCELED

                            } else {

                                TransitionState.RUNNING

                            }

                        keyguardTransitionRepository.updateTransition(

                        keyguardTransitionRepository.updateTransition(

                            id,

                            id,

                            1f - shadeModel.expansionAmount,

                            1f - shadeModel.expansionAmount,

                            nextState,

                        )



                        if (

                        if (

                                shadeModel.expansionAmount == 0f || shadeModel.expansionAmount == 1f

                            nextState == TransitionState.CANCELED ||

                                nextState == TransitionState.FINISHED

                        ) {

                        ) {

                            transitionId = null

                            transitionId = null

                                TransitionState.FINISHED

                            } else {

                                TransitionState.RUNNING

                        }

                        }



                        // If canceled, just put the state back

                        if (nextState == TransitionState.CANCELED) {

                            keyguardTransitionRepository.startTransition(

                                TransitionInfo(

                                    ownerName = name,

                                    from = KeyguardState.BOUNCER,

                                    to = KeyguardState.LOCKSCREEN,

                                    animator = getAnimator(0.milliseconds)

                                )

                                )

                            )

                        }

                    } else {

                    } else {

                        // TODO (b/251849525): Remove statusbarstate check when that state is

                        // TODO (b/251849525): Remove statusbarstate check when that state is

                        // integrated into KeyguardTransitionRepository

                        // integrated into KeyguardTransitionRepository

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt

+6 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor 
import com.android.systemui.keyguard.shared.model.AnimationParams

import com.android.systemui.keyguard.shared.model.AnimationParams

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.shared.model.KeyguardState.AOD

import com.android.systemui.keyguard.shared.model.KeyguardState.AOD

import com.android.systemui.keyguard.shared.model.KeyguardState.BOUNCER

import com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING

import com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING

import com.android.systemui.keyguard.shared.model.KeyguardState.GONE

import com.android.systemui.keyguard.shared.model.KeyguardState.GONE

import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN

import com.android.systemui.keyguard.shared.model.KeyguardState.LOCKSCREEN
@@ -30,9 +31,9 @@ import com.android.systemui.keyguard.shared.model.TransitionState 
import com.android.systemui.keyguard.shared.model.TransitionState.STARTED

import com.android.systemui.keyguard.shared.model.TransitionState.STARTED

import com.android.systemui.keyguard.shared.model.TransitionStep

import com.android.systemui.keyguard.shared.model.TransitionStep

import javax.inject.Inject

import javax.inject.Inject

import kotlin.time.Duration

import kotlin.math.max

import kotlin.math.max

import kotlin.math.min

import kotlin.math.min

import kotlin.time.Duration

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.filter

import kotlinx.coroutines.flow.filter

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.map
@@ -62,6 +63,10 @@ constructor( 
    /** LOCKSCREEN->AOD transition information. */

    /** LOCKSCREEN->AOD transition information. */

    val lockscreenToAodTransition: Flow<TransitionStep> = repository.transition(LOCKSCREEN, AOD)

    val lockscreenToAodTransition: Flow<TransitionStep> = repository.transition(LOCKSCREEN, AOD)





    /** LOCKSCREEN->BOUNCER transition information. */

    val lockscreenToBouncerTransition: Flow<TransitionStep> =

        repository.transition(LOCKSCREEN, BOUNCER)



    /** LOCKSCREEN->DREAMING transition information. */

    /** LOCKSCREEN->DREAMING transition information. */

    val lockscreenToDreamingTransition: Flow<TransitionStep> =

    val lockscreenToDreamingTransition: Flow<TransitionStep> =

        repository.transition(LOCKSCREEN, DREAMING)

        repository.transition(LOCKSCREEN, DREAMING)

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt

+19 −0
Original line number Original line Diff line number Diff line
@@ -168,6 +168,25 @@ class KeyguardTransitionRepositoryTest : SysuiTestCase() { 
        assertThat(wtfHandler.failed).isTrue()

        assertThat(wtfHandler.failed).isTrue()

    }

    }





    @Test

    fun `Attempt to manually update transition after CANCELED state throws exception`() {

        val uuid =

            underTest.startTransition(

                TransitionInfo(

                    ownerName = OWNER_NAME,

                    from = AOD,

                    to = LOCKSCREEN,

                    animator = null,

                )

            )



        checkNotNull(uuid).let {

            underTest.updateTransition(it, 0.2f, TransitionState.CANCELED)

            underTest.updateTransition(it, 0.5f, TransitionState.RUNNING)

        }

        assertThat(wtfHandler.failed).isTrue()

    }



    private fun listWithStep(

    private fun listWithStep(

        step: BigDecimal,

        step: BigDecimal,

        start: BigDecimal = BigDecimal.ZERO,

        start: BigDecimal = BigDecimal.ZERO,