Merge "Assign taskbar EDU same interpolator as all apps." into tm-qpr-dev (f5c099b5) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/TaskbarEduView.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -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<TaskbarOverlayContext>
		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<TaskbarOverlayContext>
		mIsOpen = true;
		mOpenCloseAnimator.setValues(
		PropertyValuesHolder.ofFloat(TRANSLATION_SHIFT, TRANSLATION_SHIFT_OPENED));
		mOpenCloseAnimator.setInterpolator(AGGRESSIVE_EASE);
		mOpenCloseAnimator.setInterpolator(EMPHASIZED);
		mOpenCloseAnimator.setDuration(mTaskbarEduCallbacks.getOpenDuration()).start();
		}