Merge "Reset NSSL translationY after a transision gets cancelled" into tm-qpr-dev (3da25af6) · Commits · e / os / android_frameworks_base

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 },
		)
		}

+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