Merge "Fix mSubtractDisplacement when recatching" into ub-launcher3-qt-future-dev

am: ab732f0baa Change-Id: I26ab6eb11e0ef1c53c96585ad069e1a0da629bca
2019-10-15 12:19:12 -07:00
parent 6c484bc9bf ab732f0baa
commit 5347f0c5f6
1 changed files with 1 additions and 2 deletions
@@ -330,8 +330,7 @@ public class SwipeDetector {
    private void initializeDragging() {
        if (mState == ScrollState.SETTLING && mIgnoreSlopWhenSettling) {
            mSubtractDisplacement = 0;
-        }
-        if (mDisplacement > 0) {
+        } else if (mDisplacement > 0) {
            mSubtractDisplacement = mTouchSlop;
        } else {
            mSubtractDisplacement = -mTouchSlop;