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

Commit bdcd1cc8 authored by Evan Laird's avatar Evan Laird
Browse files

Don't animate grayscale if animations are off 

Just set the final color instantly on QS icons if animations are off
(battery save mode).

Change-Id: I55a5bd6bab412b9b6a62d32b21adbf7d39cc9e72
Fixes: 62508363
Test: visual
parent 5c5f1f64

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java

+20 −16
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ public class QSIconViewImpl extends QSIconView { 
    }



    public static void animateGrayScale(int fromColor, int toColor, ImageView iv) {

        if (ValueAnimator.areAnimatorsEnabled()) {

            final float fromAlpha = Color.alpha(fromColor);

            final float toAlpha = Color.alpha(toColor);

            final float fromChannel = Color.red(fromColor);
@@ -151,7 +152,6 @@ public class QSIconViewImpl extends QSIconView { 


            ValueAnimator anim = ValueAnimator.ofFloat(0, 1);

            anim.setDuration(QS_ANIM_LENGTH);



            anim.addUpdateListener(animation -> {

                float fraction = animation.getAnimatedFraction();

                int alpha = (int) (fromAlpha + (toAlpha - fromAlpha) * fraction);
@@ -159,7 +159,11 @@ public class QSIconViewImpl extends QSIconView { 


                setTint(iv, Color.argb(alpha, channel, channel, channel));

            });



            anim.start();

        } else {

            setTint(iv, toColor);

        }

    }



    public static void setTint(ImageView iv, int color) {