am 5823352c: Cancel double tap mode on action_up

* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0': Cancel double tap mode on action_up
2013-11-14 19:44:52 -08:00
parent 64397749ef 5823352c6c
commit cce2e1944c
1 changed files with 4 additions and 0 deletions
--- 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) {