Merge "[Unfold animation] Do not animate first progress value in remote provider" into udc-dev (50ab78c2) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/systemui/unfold/progress/UnfoldRemoteFilterTest.kt

+23 −3

Original line number	Diff line number	Diff line
		@@ -39,13 +39,33 @@ class UnfoldRemoteFilterTest : SysuiTestCase() {
		}

		@Test
		fun onTransitionProgress_withInterval_propagated() {
		fun onTransitionProgress_firstProgressEvent_propagatedImmediately() {
		progressProvider.onTransitionStarted()
		progressProvider.onTransitionProgress(0.5f)

		listener.assertLastProgress(0.5f)
		}

		@Test
		fun onTransitionProgress_secondProgressEvent_isNotPropagatedImmediately() =
		InstrumentationRegistry.getInstrumentation().runOnMainSync {
		progressProvider.onTransitionStarted()
		progressProvider.onTransitionProgress(0.5f)
		progressProvider.onTransitionProgress(0.8f)

		// 0.8f should be set only later, after the animation
		listener.assertLastProgress(0.5f)
		}

		@Test
		fun onTransitionProgress_severalProgressEventsWithInterval_propagated() {
		runOnMainThreadWithInterval(
		{ progressProvider.onTransitionStarted() },
		{ progressProvider.onTransitionProgress(0.5f) }
		{ progressProvider.onTransitionProgress(0.5f) },
		{ progressProvider.onTransitionProgress(0.8f) }
		)

		listener.assertLastProgress(0.5f)
		listener.assertLastProgress(0.8f)
		}

		@Test

+12 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ class UnfoldRemoteFilter(
		}

		private var inProgress = false
		private var receivedProgressEvent = false

		private var processedProgress: Float = 1.0f
		set(newProgress) {
		@@ -54,7 +55,16 @@ class UnfoldRemoteFilter(
		override fun onTransitionProgress(progress: Float) {
		logCounter({ "$TAG#plain_remote_progress" }, progress)
		if (inProgress) {
		if (receivedProgressEvent) {
		// We have received at least one progress event, animate from the previous
		// progress to the current
		springAnimation.animateToFinalPosition(progress)
		} else {
		// This is the first progress event after starting the animation, send it
		// straightaway and set the spring value without animating it
		processedProgress = progress
		receivedProgressEvent = true
		}
		} else {
		Log.e(TAG, "Progress received while not in progress.")
		}
		@@ -62,6 +72,7 @@ class UnfoldRemoteFilter(

		override fun onTransitionFinished() {
		inProgress = false
		receivedProgressEvent = false
		listener.onTransitionFinished()
		}