commit d0a9e535731877eec0f89af0fac8fbec5766d601
author Matt Casey <mrcasey@google.com> Tue Jun 22 17:01:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 22 17:01:51 2021 +0000
tree 83aee984211289922366470c526351347c2af269
parent 0002f653e20bcbe6509528ac7f395eb866d11919
parent 3a65795298ea7a84fba43bd89b722ac0ec046a02

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

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

Change-Id: I04fd68e6f82209fd629a1fef58152262ae7b8347

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