diff options
| author | Mindy Pereira <mindyp@google.com> | 2013-11-14 17:01:25 -0800 |
|---|---|---|
| committer | Mindy DelliCarpini <mindyp@google.com> | 2013-11-15 02:48:06 +0000 |
| commit | 5823352c6c5bfa3824afacd023b01af537b5dfa0 (patch) | |
| tree | c7da7f555a63cfb704ad220db8b6d9417c9e6e6b | |
| parent | 22010817b90f97756a76777fcd1dbe7e3b63e808 (diff) | |
| download | base-5823352c6c5bfa3824afacd023b01af537b5dfa0.tar.gz | |
Cancel double tap mode on action_up
fixes b/11592408 Dragging immediately after double touch turns gesture into double touch drag
Change-Id: I3e7926a4f6f9ab4951f380bd004499c78b3bda69
| -rw-r--r-- | core/java/android/view/ScaleGestureDetector.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index f36c78fd4807..42a58a8efc22 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -323,6 +323,10 @@ public class ScaleGestureDetector { mInProgress = false; mInitialSpan = 0; mDoubleTapMode = DOUBLE_TAP_MODE_NONE; + } else if (mDoubleTapMode == DOUBLE_TAP_MODE_IN_PROGRESS && streamComplete) { + mInProgress = false; + mInitialSpan = 0; + mDoubleTapMode = DOUBLE_TAP_MODE_NONE; } if (streamComplete) { |