commit 37567c24f8f95cc274894d3192e0fb4ee29e4a9c
author Matt Casey <mrcasey@google.com> Tue Jun 22 17:28:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 22 17:28:36 2021 +0000
tree 627381d5cc48f290fa7e26a3fd16d5520ac54b41
parent 9804e95a93c5058be29c5c350fe85b53368ebdfb
parent d85152e48440e17cb4ed6b7fd6c7dbd935c22421

Merge "Send a zero for assist invocation on animation end" into sc-dev am: 3a65795298 am: d85152e484

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15065435

Change-Id: I0327d3932072b5e3829f9139f822defc17b50964

quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
index a3cd7df..510820a 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/AssistantInputConsumer.java
@@ -26,6 +26,8 @@
 
 import static com.android.launcher3.Utilities.squaredHypot;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Resources;
@@ -199,6 +201,14 @@
                         float progress = (float) valueAnimator.getAnimatedValue();
                         SystemUiProxy.INSTANCE.get(mContext).onAssistantProgress(progress);
                     });
+                    // Ensure that we always send a zero at the end to clear the invocation state.
+                    animator.addListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            super.onAnimationEnd(animation);
+                            SystemUiProxy.INSTANCE.get(mContext).onAssistantProgress(0f);
+                        }
+                    });
                     animator.setInterpolator(Interpolators.DEACCEL_2);
                     animator.start();
                 }