commit 97383f457de5324470679817a79c682f15801465
author Miranda Kephart <mkephart@google.com> Thu May 16 17:23:20 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 16 17:23:20 2019 -0700
tree 5b2d0facb9e1c3e3ded2d5d0ae709f92b9491af6
parent 3c2970e4076bf47407184529f90b20abbed5f7d0
parent fcfac8156d839937ff5aea55b8188b8d37d41787

Merge "Avoid double triggering assistant gesture haptic" into ub-launcher3-qt-dev
am: fcfac8156d

Change-Id: Ic3b5b77441e04ff45f6f97f9f3824d8577ed7665

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);
         }