commit fcfac8156d839937ff5aea55b8188b8d37d41787
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 17 00:03:46 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 17 00:03:46 2019 +0000
tree d03fb78a043627f3acf0cedf6aefba700fe2011e
parent 3c7f48116c7ac39494ad08bfc06d5259748bef0c
parent 6366d377af300bbd8d881169e3df8385415f20fa

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

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