Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with left-flings when distanceToDestination = 0.

Browse Source 
Test: atest SystemUITests
Change-Id: I96aaa6869713edfa9235fc858e193399e0301e30
This commit is contained in:
Joshua Tsuji
2020-01-15 14:28:38 -05:00
parent 1093ceb659
commit a26539987c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
max(velocityToReachDestination, startVelocity)
// 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