Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev

Browse Source
This commit is contained in:
Michael Kwan
2016-12-15 21:09:53 +00:00
committed by Android (Google) Code Review
parent 74f9e1b867 8a9b27773b
commit 738fb65657
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/widget/SwipeDismissLayout.java
View File

@@ -330,18 +330,16 @@ public class SwipeDismissLayout extends FrameLayout {
mVelocityTracker.addMovement(ev); mVelocityTracker.addMovement(ev);
mVelocityTracker.computeCurrentVelocity(1000); mVelocityTracker.computeCurrentVelocity(1000);
if (!mDismissed) { if (!mDismissed) {
if ((deltaX > (getWidth() * DISMISS_MIN_DRAG_WIDTH_RATIO) &&
if (deltaX > (getWidth() * DISMISS_MIN_DRAG_WIDTH_RATIO) && ev.getRawX() >= mLastX)
ev.getRawX() >= mLastX) { || mVelocityTracker.getXVelocity() >= mMinFlingVelocity) {
mDismissed = true; mDismissed = true;
} }
} }
// Check if the user tried to undo this. // Check if the user tried to undo this.
if (mDismissed && mSwiping) { if (mDismissed && mSwiping) {
// Check if the user's finger is actually back // Check if the user's finger is actually flinging back to left
if (deltaX < (getWidth() * DISMISS_MIN_DRAG_WIDTH_RATIO) || if (mVelocityTracker.getXVelocity() < -mMinFlingVelocity) {
// or user is flinging back left
mVelocityTracker.getXVelocity() < -mMinFlingVelocity) {
mDismissed = false; mDismissed = false;
} }
} }