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

Commit 0afff725 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge changes from topic... 

Merge "Merge changes from topic "presubmit-am-b1e78f9adaeb496da178ba91df448585" into tm-qpr-dev-plus-aosp am: 7e39707f" into udc-dev
parents 639da499 e306d084

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModel.kt

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ constructor( 
            duration = TO_LOCKSCREEN_DURATION,

            onStep = { value -> -translatePx + value * translatePx },

            interpolator = EMPHASIZED_DECELERATE,

            onCancel = { 0f },

        )

    }

packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToLockscreenTransitionViewModelTest.kt

+15 −0
Original line number Diff line number Diff line
@@ -92,6 +92,21 @@ class OccludedToLockscreenTransitionViewModelTest : SysuiTestCase() { 
            job.cancel()

        }



    @Test

    fun lockscreenTranslationYResettedAfterJobCancelled() =

        runTest(UnconfinedTestDispatcher()) {

            val values = mutableListOf<Float>()



            val pixels = 100

            val job =

                underTest.lockscreenTranslationY(pixels).onEach { values.add(it) }.launchIn(this)

            repository.sendTransitionStep(step(0.5f, TransitionState.CANCELED))



            assertThat(values.last()).isEqualTo(0f)



            job.cancel()

        }



    private fun step(

        value: Float,

        state: TransitionState = TransitionState.RUNNING