Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5d8f17b authored by Florence Yang's avatar Florence Yang Committed by Android (Google) Code Review
Browse files

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

parents 7fc8c3b3 d9f516d9

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

+2 −2
Original line number Diff line number Diff line
@@ -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);