From 5823352c6c5bfa3824afacd023b01af537b5dfa0 Mon Sep 17 00:00:00 2001
From: Mindy Pereira <mindyp@google.com>
Date: Thu, 14 Nov 2013 17:01:25 -0800
Subject: Cancel double tap mode on action_up

fixes b/11592408 Dragging immediately after double touch turns gesture into double touch drag

Change-Id: I3e7926a4f6f9ab4951f380bd004499c78b3bda69
---
 core/java/android/view/ScaleGestureDetector.java | 4 ++++
 1 file changed, 4 insertions(+)

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) {
-- 
cgit v1.2.3-59-g8ed1b