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

Commit e306d084 authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-b1e78f9adaeb496da178ba91df448585" into... 

Merge changes from topic "presubmit-am-b1e78f9adaeb496da178ba91df448585" into tm-qpr-dev-plus-aosp am: 7e39707f

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



Change-Id: I53cd660da02a2ca3c4cd72bee260a1f2bfc3ab0b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e7b20e5 7e39707f

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