| commit | 5347f0c5f6f67f48d1a57bbe7097e48fc3f7f72d | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Tue Oct 15 12:19:12 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 15 12:19:12 2019 -0700 |
| tree | df51a48d557bd1ae9fc4316003cd05c3594c79cb | |
| parent | 6c484bc9bf332d9ac8e73f2d577e25365616d4b5 [diff] | |
| parent | ab732f0baa0a8c80a6ad898066a345589888cc35 [diff] |
Merge "Fix mSubtractDisplacement when recatching" into ub-launcher3-qt-future-dev am: ab732f0baa Change-Id: I26ab6eb11e0ef1c53c96585ad069e1a0da629bca
diff --git a/src/com/android/launcher3/touch/SwipeDetector.java b/src/com/android/launcher3/touch/SwipeDetector.java index d0edfd8..c38ca24 100644 --- a/src/com/android/launcher3/touch/SwipeDetector.java +++ b/src/com/android/launcher3/touch/SwipeDetector.java
@@ -330,8 +330,7 @@ private void initializeDragging() { if (mState == ScrollState.SETTLING && mIgnoreSlopWhenSettling) { mSubtractDisplacement = 0; - } - if (mDisplacement > 0) { + } else if (mDisplacement > 0) { mSubtractDisplacement = mTouchSlop; } else { mSubtractDisplacement = -mTouchSlop;