Fix issue with left-flings when distanceToDestination = 0. (a2653998) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/util/animation/PhysicsAnimator.kt

+13 −9

Original line number	Diff line number	Diff line
		@@ -293,15 +293,19 @@ class PhysicsAnimator<T> private constructor (val target: T) {
		val velocityToReachDestination = distanceToDestination *
		(flingConfig.friction * FLING_FRICTION_SCALAR_MULTIPLIER)

		// Try to use the provided start velocity, but use the required velocity to reach the
		// destination if the provided velocity is insufficient.
		val sufficientVelocity =
		if (distanceToDestination < 0)
		min(velocityToReachDestination, startVelocity)
		else
		// If there's distance to cover, and the provided velocity is moving in the correct
		// direction, ensure that the velocity is high enough to reach the destination.
		// Otherwise, just use startVelocity - this means that the fling is at or out of bounds.
		// The fling will immediately end and a spring will bring the object back into bounds
		// with this startVelocity.
		flingConfigCopy.startVelocity = when {
		distanceToDestination > 0f && startVelocity >= 0f ->
		max(velocityToReachDestination, startVelocity)
		distanceToDestination < 0f && startVelocity <= 0f ->
		min(velocityToReachDestination, startVelocity)
		else -> startVelocity
		}

		flingConfigCopy.startVelocity = sufficientVelocity
		springConfigCopy.finalPosition = toAtLeast
		} else {
		flingConfigCopy.startVelocity = startVelocity