From 81a56f9acc8a6db1b78088e6aca8e343a49f8952 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Fri, 30 Sep 2016 12:57:16 -0700 Subject: Agressively change the color of the the all apps background during pull up b/30502942 Change-Id: Iea072d95ed4f62907b164b2c4ee75ad737eccb7a --- .../launcher3/allapps/AllAppsTransitionController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 1719b0594..9f1e9e8e7 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -6,12 +6,15 @@ import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; +import android.graphics.Color; import android.support.v4.content.ContextCompat; +import android.support.v4.graphics.ColorUtils; import android.support.v4.view.animation.FastOutSlowInInterpolator; import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.animation.AccelerateInterpolator; +import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import com.android.launcher3.DeviceProfile; @@ -41,6 +44,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul private static final boolean DBG = false; private final Interpolator mAccelInterpolator = new AccelerateInterpolator(2f); + private final Interpolator mDecelInterpolator = new DecelerateInterpolator(3f); private final Interpolator mFastOutSlowInInterpolator = new FastOutSlowInInterpolator(); private final ScrollInterpolator mScrollInterpolator = new ScrollInterpolator(); @@ -305,12 +309,14 @@ public class AllAppsTransitionController implements TouchController, VerticalPul float workspaceHotseatAlpha = Utilities.boundToRange(progress, 0f, 1f); float alpha = 1 - workspaceHotseatAlpha; - float interpolation = mAccelInterpolator.getInterpolation(workspaceHotseatAlpha); - int color = (Integer) mEvaluator.evaluate(alpha, + int color = (Integer) mEvaluator.evaluate(mDecelInterpolator.getInterpolation(alpha), mHotseatBackgroundColor, mAllAppsBackgroundColor); - mAppsView.setRevealDrawableColor(color); + int bgAlpha = Color.alpha((int) mEvaluator.evaluate(alpha, + mHotseatBackgroundColor, mAllAppsBackgroundColor)); + + mAppsView.setRevealDrawableColor(ColorUtils.setAlphaComponent(color, bgAlpha)); mAppsView.getContentView().setAlpha(alpha); mAppsView.setTranslationY(shiftCurrent); -- cgit v1.2.3