Skip to content

Commit

Permalink
Closes #956
Browse files Browse the repository at this point in the history
  • Loading branch information
Adamantcheese committed Jun 28, 2020
1 parent b96682c commit fb54f68
Showing 1 changed file with 5 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void requestDisallowInterceptTouchEvent(boolean disallowIntercept) {
}
blockTracking = false;
if (tracking) {
endTracking(false);
endTracking(true);
}
}

Expand Down Expand Up @@ -244,12 +244,14 @@ public boolean onTouchEvent(MotionEvent event) {
}

if (doFlingAway) {
startFlingAnimation(true);
this.finishTransitionAfterAnimation = true;
} else {
scroller.forceFinished(true);
scroller.startScroll(translationX, 0, -translationX, 0, 250);
startFlingAnimation(false);
this.finishTransitionAfterAnimation = false;
}

ViewCompat.postOnAnimation(this, flingRunnable);
} else {
// User swiped back to the left
endTracking(false);
Expand Down Expand Up @@ -335,11 +337,6 @@ private void endTracking(boolean finishTransition) {
behindTrackingController = null;
}

private void startFlingAnimation(boolean finishTransitionAfterAnimation) {
this.finishTransitionAfterAnimation = finishTransitionAfterAnimation;
ViewCompat.postOnAnimation(this, flingRunnable);
}

private Runnable flingRunnable = new Runnable() {
@Override
public void run() {
Expand Down

0 comments on commit fb54f68

Please sign in to comment.