commit 6366d377af300bbd8d881169e3df8385415f20fa
author Miranda Kephart <mkephart@google.com> Thu May 16 17:54:07 2019 -0400
committer Miranda Kephart <mkephart@google.com> Thu May 16 18:00:14 2019 -0400
tree a5b1e622bdf1eb91812a6a5225f51f4b469001ea
parent c2968da3728006942cc105dc562ad04d907dfaea

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/recents_ui_overrides/src/com/android/quickstep/inputconsumers/AssistantTouchConsumer.java

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 0448fd1..c1a5ddc 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 @@
 
     @Override
     public void onDragEnd(float velocity, boolean fling) {
-        if (fling) {
+        if (fling && !mLaunchedAssistant) {
             mLastProgress = 1;
             updateAssistant(FLING);
         }