From a13f7f363fce2839ab00a7a870969ad7fe32170e Mon Sep 17 00:00:00 2001
From: Andrei Stingaceanu <stg@google.com>
Date: Thu, 18 Aug 2016 15:44:38 +0100
Subject: [PATCH] GestureDetector - fix longPress timeout

Remove adding the TAP_TIMEOUT to the LONGPRESS_TIMEOUT
in order to inline the longpress detection logic with
the non-GestureDetector framework implementations.

Bug: 30895236
Bug: 30937837
Change-Id: I67f4fa141804ae645553eb4edc8a80a512d018c5
---
 core/java/android/view/GestureDetector.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/java/android/view/GestureDetector.java b/core/java/android/view/GestureDetector.java
index b705cf1843576..27c1dcbe8ece9 100644
--- a/core/java/android/view/GestureDetector.java
+++ b/core/java/android/view/GestureDetector.java
@@ -583,10 +583,11 @@ public class GestureDetector {
 
             if (mIsLongpressEnabled) {
                 mHandler.removeMessages(LONG_PRESS);
-                mHandler.sendEmptyMessageAtTime(LONG_PRESS, mCurrentDownEvent.getDownTime()
-                        + TAP_TIMEOUT + LONGPRESS_TIMEOUT);
+                mHandler.sendEmptyMessageAtTime(LONG_PRESS,
+                        mCurrentDownEvent.getDownTime() + LONGPRESS_TIMEOUT);
             }
-            mHandler.sendEmptyMessageAtTime(SHOW_PRESS, mCurrentDownEvent.getDownTime() + TAP_TIMEOUT);
+            mHandler.sendEmptyMessageAtTime(SHOW_PRESS,
+                    mCurrentDownEvent.getDownTime() + TAP_TIMEOUT);
             handled |= mListener.onDown(ev);
             break;