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

Commit 65d9ceb3 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Disabling page fling while the overlay is moving

Bug: 37959201
Change-Id: I2278a46d10bc81855e10f97e669460e0d0b93daa
parent 0e261d56
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -1599,7 +1599,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
                mTotalMotionX += Math.abs(mLastMotionX + mLastMotionXRemainder - x);

                boolean isFling = mTotalMotionX > MIN_LENGTH_FOR_FLING &&
                        Math.abs(velocityX) > mFlingThresholdVelocity;
                        shouldFlingForVelocity(velocityX);

                if (!mFreeScroll) {
                    // In the case that the page is moved far to one direction and then is flung
@@ -1705,6 +1705,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
        return true;
    }

    protected boolean shouldFlingForVelocity(int velocityX) {
        return Math.abs(velocityX) > mFlingThresholdVelocity;
    }

    private void resetTouchState() {
        releaseVelocityTracker();
        endReordering();
+7 −0
Original line number Diff line number Diff line
@@ -1462,6 +1462,13 @@ public class Workspace extends PagedView
        }
    }

    @Override
    protected boolean shouldFlingForVelocity(int velocityX) {
        // When the overlay is moving, the fling or settle transition is controlled by the overlay.
        return Float.compare(mOverlayTranslation, 0) == 0 &&
                super.shouldFlingForVelocity(velocityX);
    }

    private final Interpolator mAlphaInterpolator = new DecelerateInterpolator(3f);

    /**