Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a657952 authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Send a zero for assist invocation on animation end" into sc-dev

parents 719be9a9 eeac1aba
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import static android.view.MotionEvent.ACTION_UP;

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 @@ public class AssistantInputConsumer extends DelegateInputConsumer {
                        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();
                }