From 6366d377af300bbd8d881169e3df8385415f20fa Mon Sep 17 00:00:00 2001
From: Miranda Kephart <mkephart@google.com>
Date: Thu, 16 May 2019 17:54:07 -0400
Subject: [PATCH] Avoid double triggering assistant gesture haptic

If the user drags almost all the way to gesture completion and
then flings, the haptic got triggered twice: first for the drag,
and then once the fling was registered. This checks whether the
assistant was already invoked before triggering the fling
invocation.

Bug: 132908798
Test: manual
Change-Id: Ibeed7279b8db32527490a0e11b8e5f0761187bbf
---
 .../quickstep/inputconsumers/AssistantTouchConsumer.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java
index 0448fd14ac..c1a5ddc276 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java
@@ -257,7 +257,7 @@ public class AssistantTouchConsumer extends DelegateInputConsumer
 
     @Override
     public void onDragEnd(float velocity, boolean fling) {
-        if (fling) {
+        if (fling && !mLaunchedAssistant) {
             mLastProgress = 1;
             updateAssistant(FLING);
         }