commit a5d8f17b6292c94cd86b58208fb1fb52623f6b84
author Florence Yang <florenceyang@google.com> Wed Oct 26 00:31:23 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 26 00:31:23 2022 +0000
tree 671460d0e54bdbb500a987067afe59123443a360
parent 7fc8c3b3e6cbade6a41788f24e1eda200d2dd9c4
parent d9f516d984ee44d6c05f0e2082c8bf405eb2f9ac

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

packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java

diff --git a/packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java b/packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java
index bbba007..b36f0d7 100644
--- a/packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java
@@ -33,13 +33,13 @@
 
 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 @@
             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);