diff options
| author | 2013-11-14 19:44:52 -0800 | |
|---|---|---|
| committer | 2013-11-14 19:44:52 -0800 | |
| commit | cce2e1944c4ac9411fa25534eb9b51d6f044dfb4 (patch) | |
| tree | 426abe4e8acd0ff1ef466f7844007fc81649aa53 | |
| parent | 64397749effa088dcea3799fc8440845c5a1c193 (diff) | |
| parent | 5823352c6c5bfa3824afacd023b01af537b5dfa0 (diff) | |
am 5823352c: Cancel double tap mode on action_up
* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0':
Cancel double tap mode on action_up
| -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) { |