am cce2e194: am 5823352c: Cancel double tap mode on action_up

* commit 'cce2e1944c4ac9411fa25534eb9b51d6f044dfb4': Cancel double tap mode on action_up
2013-11-14 19:48:42 -08:00
parent 461febadc4 cce2e1944c
commit bb8e75e6c4
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) {