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

Merge "Fix incorrect values for VelocityTracker in SwipeDismissLayout." into cw-f-dev

Browse Source 
am: c61cd1a635

Change-Id: Ib1cff2ace082862c2a1c250170453b989f6697df
This commit is contained in:
Michael Kwan
2017-02-14 22:53:41 +00:00
committed by android-build-merger
parent d043a840f7 c61cd1a635
commit 83b072c48c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,6 @@ public class SwipeDismissLayout extends FrameLayout {
private boolean mDismissed; private boolean mDismissed;
private boolean mDiscardIntercept; private boolean mDiscardIntercept;
private VelocityTracker mVelocityTracker; private VelocityTracker mVelocityTracker;
private float mTranslationX;
private boolean mBlockGesture = false; private boolean mBlockGesture = false;
private boolean mActivityTranslucencyConverted = false; private boolean mActivityTranslucencyConverted = false;
@@ -166,8 +165,10 @@ public class SwipeDismissLayout extends FrameLayout {
return super.onInterceptTouchEvent(ev); return super.onInterceptTouchEvent(ev);
} }
// offset because the view is translated during swipe // Offset because the view is translated during swipe, match X with raw X. Active touch
ev.offsetLocation(mTranslationX, 0); // coordinates are mostly used by the velocity tracker, so offset it to match the raw
// coordinates which is what is primarily used elsewhere.
ev.offsetLocation(ev.getRawX() - ev.getX(), 0);
switch (ev.getActionMasked()) { switch (ev.getActionMasked()) {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
@@ -232,8 +233,12 @@ public class SwipeDismissLayout extends FrameLayout {
if (mVelocityTracker == null || !mDismissable) { if (mVelocityTracker == null || !mDismissable) {
return super.onTouchEvent(ev); return super.onTouchEvent(ev);
} }
// offset because the view is translated during swipe
ev.offsetLocation(mTranslationX, 0); // Offset because the view is translated during swipe, match X with raw X. Active touch
// coordinates are mostly used by the velocity tracker, so offset it to match the raw
// coordinates which is what is primarily used elsewhere.
ev.offsetLocation(ev.getRawX() - ev.getX(), 0);
switch (ev.getActionMasked()) { switch (ev.getActionMasked()) {
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
updateDismiss(ev); updateDismiss(ev);
@@ -266,7 +271,6 @@ public class SwipeDismissLayout extends FrameLayout {
} }
private void setProgress(float deltaX) { private void setProgress(float deltaX) {
mTranslationX = deltaX;
if (mProgressListener != null && deltaX >= 0) { if (mProgressListener != null && deltaX >= 0) {
mProgressListener.onSwipeProgressChanged( mProgressListener.onSwipeProgressChanged(
this, progressToAlpha(deltaX / getWidth()), deltaX); this, progressToAlpha(deltaX / getWidth()), deltaX);
@@ -300,7 +304,6 @@ public class SwipeDismissLayout extends FrameLayout {
mVelocityTracker.recycle(); mVelocityTracker.recycle();
} }
mVelocityTracker = null; mVelocityTracker = null;
mTranslationX = 0;
mDownX = 0; mDownX = 0;
mLastX = Integer.MIN_VALUE; mLastX = Integer.MIN_VALUE;
mDownY = 0; mDownY = 0;