Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d596b6e4 authored by Michael Mikhail's avatar Michael Mikhail Committed by Automerger Merge Worker
Browse files

Fixing animation behavior on UMO snapback am: 4e512f9f 

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



Change-Id: I64d5c4189ec429f808e05aaaac4188a14afdc248
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02e06d00 4e512f9f

packages/SystemUI/src/com/android/systemui/media/MediaCarouselScrollHandler.kt

+4 −1
Original line number Diff line number Diff line
@@ -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