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

Commit 8a9b2777 authored by Michael Kwan's avatar Michael Kwan
Browse files

Fix swipe-to-dismiss to properly react to swipe gestures. 

Test: manual test
Bug: 33588580
Change-Id: If8d03f90a25e989e254e3a21bafef4e76bab5d7b
parent 3350ae9c

core/java/com/android/internal/widget/SwipeDismissLayout.java

+5 −7
Original line number Diff line number Diff line
@@ -330,18 +330,16 @@ public class SwipeDismissLayout extends FrameLayout { 
        mVelocityTracker.addMovement(ev);

        mVelocityTracker.computeCurrentVelocity(1000);

        if (!mDismissed) {



            if (deltaX > (getWidth() * DISMISS_MIN_DRAG_WIDTH_RATIO) &&

                    ev.getRawX() >= mLastX) {

            if ((deltaX > (getWidth() * DISMISS_MIN_DRAG_WIDTH_RATIO) &&

                    ev.getRawX() >= mLastX)

                    || mVelocityTracker.getXVelocity() >= mMinFlingVelocity) {

                mDismissed = true;

            }

        }

        // Check if the user tried to undo this.

        if (mDismissed && mSwiping) {

            // Check if the user's finger is actually back

            if (deltaX < (getWidth() * DISMISS_MIN_DRAG_WIDTH_RATIO) ||

                    // or user is flinging back left

                    mVelocityTracker.getXVelocity() < -mMinFlingVelocity) {

            // Check if the user's finger is actually flinging back to left

            if (mVelocityTracker.getXVelocity() < -mMinFlingVelocity) {

                mDismissed = false;

            }

        }