Merge "Speed up dark/light mode transition animation" into tm-qpr-dev am: a5d8f17b62

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20274181

Change-Id: I06729acab326a42dc161e54334ee9076c0cc3881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florence Yang
2022-10-26 01:11:20 +00:00
committed by Automerger Merge Worker

View File

@@ -33,13 +33,13 @@ import android.view.animation.DecelerateInterpolator;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.graphics.ColorUtils;
import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
/**
* Drawable used on SysUI scrims.
*/
public class ScrimDrawable extends Drawable {
private static final String TAG = "ScrimDrawable";
private static final long COLOR_ANIMATION_DURATION = 2000;
private final Paint mPaint;
private int mAlpha = 255;
@@ -76,7 +76,7 @@ public class ScrimDrawable extends Drawable {
final int mainFrom = mMainColor;
ValueAnimator anim = ValueAnimator.ofFloat(0, 1);
anim.setDuration(COLOR_ANIMATION_DURATION);
anim.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);
anim.addUpdateListener(animation -> {
float ratio = (float) animation.getAnimatedValue();
mMainColor = ColorUtils.blendARGB(mainFrom, mainColor, ratio);