From 47da4167ea5d6a95afa9239db797c95ce9b679ff Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Tue, 13 Dec 2022 16:43:36 -0500 Subject: [PATCH] Assign taskbar EDU same interpolator as all apps. This polishes closing both at the same time when they are on top of each other. Test: Manual Bug: 217261955 Change-Id: Iecb8658b98debb0225d3b59da99ecb34d008971a --- .../com/android/launcher3/taskbar/TaskbarEduView.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduView.java index d38c6d1d4d..5702b6bb5c 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduView.java @@ -15,7 +15,7 @@ */ package com.android.launcher3.taskbar; -import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE; +import static com.android.launcher3.anim.Interpolators.EMPHASIZED; import android.animation.PropertyValuesHolder; import android.content.Context; @@ -24,6 +24,7 @@ import android.provider.Settings; import android.util.AttributeSet; import android.util.Pair; import android.view.View; +import android.view.animation.Interpolator; import android.widget.Button; import com.android.launcher3.Insettable; @@ -65,6 +66,11 @@ public class TaskbarEduView extends AbstractSlideInView handleClose(animate, mTaskbarEduCallbacks.getCloseDuration()); } + @Override + protected Interpolator getIdleInterpolator() { + return EMPHASIZED; + } + @Override protected boolean isOfType(int type) { return (type & TYPE_TASKBAR_EDUCATION_DIALOG) != 0; @@ -157,7 +163,7 @@ public class TaskbarEduView extends AbstractSlideInView mIsOpen = true; mOpenCloseAnimator.setValues( PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED)); - mOpenCloseAnimator.setInterpolator(AGGRESSIVE_EASE); + mOpenCloseAnimator.setInterpolator(EMPHASIZED); mOpenCloseAnimator.setDuration(mTaskbarEduCallbacks.getOpenDuration()).start(); }