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

Add tweaks to smooth out swipe to dismiss.

Browse Source 
am: 5758a9a94c

Change-Id: I64b9e88a7efb164b0e0160f8b25f770fb986efd6
This commit is contained in:
Michael Kwan
2017-02-13 19:32:35 +00:00
committed by android-build-merger
parent 3de5971b40 5758a9a94c
commit 2155f773db
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,8 @@ import android.widget.FrameLayout;
public class SwipeDismissLayout extends FrameLayout { public class SwipeDismissLayout extends FrameLayout {
private static final String TAG = "SwipeDismissLayout"; private static final String TAG = "SwipeDismissLayout";
private static final float DISMISS_MIN_DRAG_WIDTH_RATIO = .33f; private static final float MAX_DIST_THRESHOLD = .33f;
private static final float MIN_DIST_THRESHOLD = .1f;
public interface OnDismissedListener { public interface OnDismissedListener {
void onDismissed(SwipeDismissLayout layout); void onDismissed(SwipeDismissLayout layout);
@@ -73,6 +74,7 @@ public class SwipeDismissLayout extends FrameLayout {
private int mActiveTouchId; private int mActiveTouchId;
private float mDownX; private float mDownX;
private float mDownY; private float mDownY;
private float mLastX;
private boolean mSwiping; private boolean mSwiping;
private boolean mDismissed; private boolean mDismissed;
private boolean mDiscardIntercept; private boolean mDiscardIntercept;
@@ -105,7 +107,6 @@ public class SwipeDismissLayout extends FrameLayout {
}; };
private IntentFilter mScreenOffFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF); private IntentFilter mScreenOffFilter = new IntentFilter(Intent.ACTION_SCREEN_OFF);
private float mLastX;
private boolean mDismissable = true; private boolean mDismissable = true;
@@ -174,7 +175,7 @@ public class SwipeDismissLayout extends FrameLayout {
mDownX = ev.getRawX(); mDownX = ev.getRawX();
mDownY = ev.getRawY(); mDownY = ev.getRawY();
mActiveTouchId = ev.getPointerId(0); mActiveTouchId = ev.getPointerId(0);
mVelocityTracker = VelocityTracker.obtain(); mVelocityTracker = VelocityTracker.obtain("int1");
mVelocityTracker.addMovement(ev); mVelocityTracker.addMovement(ev);
break; break;
@@ -238,7 +239,10 @@ public class SwipeDismissLayout extends FrameLayout {
updateDismiss(ev); updateDismiss(ev);
if (mDismissed) { if (mDismissed) {
mDismissAnimator.animateDismissal(ev.getRawX() - mDownX); mDismissAnimator.animateDismissal(ev.getRawX() - mDownX);
} else if (mSwiping) { } else if (mSwiping
// Only trigger animation if we had a MOVE event that would shift the
// underlying view, otherwise the animation would be janky.
&& mLastX != Integer.MIN_VALUE) {
mDismissAnimator.animateRecovery(ev.getRawX() - mDownX); mDismissAnimator.animateRecovery(ev.getRawX() - mDownX);
} }
resetMembers(); resetMembers();
@@ -298,6 +302,7 @@ public class SwipeDismissLayout extends FrameLayout {
mVelocityTracker = null; mVelocityTracker = null;
mTranslationX = 0; mTranslationX = 0;
mDownX = 0; mDownX = 0;
mLastX = Integer.MIN_VALUE;
mDownY = 0; mDownY = 0;
mSwiping = false; mSwiping = false;
mDismissed = false; mDismissed = false;
@@ -329,19 +334,32 @@ public class SwipeDismissLayout extends FrameLayout {
private void updateDismiss(MotionEvent ev) { private void updateDismiss(MotionEvent ev) {
float deltaX = ev.getRawX() - mDownX; float deltaX = ev.getRawX() - mDownX;
mVelocityTracker.addMovement(ev); // Don't add the motion event as an UP event would clear the velocity tracker
mVelocityTracker.computeCurrentVelocity(1000); mVelocityTracker.computeCurrentVelocity(1000);
float xVelocity = mVelocityTracker.getXVelocity();
if (mLastX == Integer.MIN_VALUE) {
// If there's no changes to mLastX, we have only one point of data, and therefore no
// velocity. Estimate velocity from just the up and down event in that case.
xVelocity = deltaX / ((ev.getEventTime() - ev.getDownTime()) / 1000);
}
if (!mDismissed) { if (!mDismissed) {
if ((deltaX > (getWidth() * DISMISS_MIN_DRAG_WIDTH_RATIO) && // Adjust the distance threshold linearly between the min and max threshold based on the
ev.getRawX() >= mLastX) // x-velocity scaled with the the fling threshold speed
|| mVelocityTracker.getXVelocity() >= mMinFlingVelocity) { float distanceThreshold = getWidth() * Math.max(
Math.min((MIN_DIST_THRESHOLD - MAX_DIST_THRESHOLD)
* xVelocity / mMinFlingVelocity // scale x-velocity with fling velocity
+ MAX_DIST_THRESHOLD, // offset to start at max threshold
MAX_DIST_THRESHOLD), // cap at max threshold
MIN_DIST_THRESHOLD); // bottom out at min threshold
if ((deltaX > distanceThreshold && ev.getRawX() >= mLastX)
|| xVelocity >= 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 flinging back to left // Check if the user's finger is actually flinging back to left
if (mVelocityTracker.getXVelocity() < -mMinFlingVelocity) { if (xVelocity < -mMinFlingVelocity) {
mDismissed = false; mDismissed = false;
} }
} }