Fixing animation behavior on UMO snapback am: 4e512f9f98

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

Change-Id: I64d5c4189ec429f808e05aaaac4188a14afdc248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Michael Mikhail
2022-10-13 15:19:46 +00:00
committed by Automerger Merge Worker

View File

@@ -289,7 +289,10 @@ class MediaCarouselScrollHandler(
return false
}
}
if (isUp || motionEvent.action == MotionEvent.ACTION_CANCEL) {
if (motionEvent.action == MotionEvent.ACTION_MOVE) {
// cancel on going animation if there is any.
PhysicsAnimator.getInstance(this).cancel()
} else if (isUp || motionEvent.action == MotionEvent.ACTION_CANCEL) {
// It's an up and the fling didn't take it above
val relativePos = scrollView.relativeScrollX % playerWidthPlusPadding
val scrollXAmount: Int