summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Gus Prevas <kprevas@google.com> 2015-05-01 07:49:31 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-05-01 07:49:31 +0000
commit25e99ce6d6e3191282a08b115d4b703277d19cd1 (patch)
treeca9ec567cf1edecb2be52a618aa62f18af36b11e
parent50b37f8c6a7237af29f533b83ee2176301d107ea (diff)
parent043d7a94ab3f3c744a5fe6a64e9f6375cd89b9cd (diff)
am 043d7a94: am 12b1b8ed: am 026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
* commit '043d7a94ab3f3c744a5fe6a64e9f6375cd89b9cd': Fixes velocity tracking bug in SwipeDismissLayout.
-rw-r--r--core/java/com/android/internal/widget/SwipeDismissLayout.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/SwipeDismissLayout.java b/core/java/com/android/internal/widget/SwipeDismissLayout.java
index 191662c1e621..6d4e0583b4e1 100644
--- a/core/java/com/android/internal/widget/SwipeDismissLayout.java
+++ b/core/java/com/android/internal/widget/SwipeDismissLayout.java
@@ -216,6 +216,8 @@ public class SwipeDismissLayout extends FrameLayout {
if (mVelocityTracker == null) {
return super.onTouchEvent(ev);
}
+ // offset because the view is translated during swipe
+ ev.offsetLocation(mTranslationX, 0);
switch (ev.getActionMasked()) {
case MotionEvent.ACTION_UP:
updateDismiss(ev);