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

Commit 653c139e authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed an issue where icons could remain white 

Test: code inspection
Change-Id: Ib2d2e5f5a638bd86fcd17e8c3dfe28501de75bad
Fixes: 77024183
parent 150bafd2

packages/SystemUI/res/values/ids.xml

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
    <item type="id" name="notification_temperature"/>

    <item type="id" name="notification_plugin"/>

    <item type="id" name="transformation_start_x_tag"/>

    <item type="id" name="doze_intensity_tag"/>

    <item type="id" name="transformation_start_y_tag"/>

    <item type="id" name="transformation_start_actual_width"/>

    <item type="id" name="transformation_start_actual_height"/>

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi 
            updateDecorColor();

            updateIconColor();

            updateAllowAnimation();

        }, dark, fade, delay);

        }, dark, fade, delay, this);

    }



    private void updateAllowAnimation() {

packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridGroupManager.java

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public class HybridGroupManager { 
        mDozer.setIntensityDark((f)->{

            mDarkAmount = f;

            updateOverFlowNumberColor(view);

        }, dark, fade, delay);

        }, dark, fade, delay, view);

        view.setTextSize(TypedValue.COMPLEX_UNIT_PX,

                dark ? mOverflowNumberSizeDark : mOverflowNumberSize);

        int paddingEnd = dark ? mOverflowNumberPaddingDark : mOverflowNumberPadding;

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationDozeHelper.java

+20 −2
Original line number Diff line number Diff line
@@ -21,14 +21,17 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.ValueAnimator;

import android.graphics.ColorMatrix;

import android.graphics.ColorMatrixColorFilter;

import android.view.View;

import android.widget.ImageView;



import com.android.systemui.Interpolators;

import com.android.systemui.R;

import com.android.systemui.statusbar.phone.NotificationPanelView;



import java.util.function.Consumer;



public class NotificationDozeHelper {

    private static final int DOZE_ANIMATOR_TAG = R.id.doze_intensity_tag;

    private final ColorMatrix mGrayscaleColorMatrix = new ColorMatrix();



    public void fadeGrayscale(final ImageView target, final boolean dark, long delay) {
@@ -76,11 +79,26 @@ public class NotificationDozeHelper { 
    }



    public void setIntensityDark(Consumer<Float> listener, boolean dark,

            boolean animate, long delay) {

            boolean animate, long delay, View view) {

        if (animate) {

            startIntensityAnimation(a -> listener.accept((Float) a.getAnimatedValue()), dark, delay,

                    null /* listener */);

                    new AnimatorListenerAdapter() {



                        @Override

                        public void onAnimationEnd(Animator animation) {

                            view.setTag(DOZE_ANIMATOR_TAG, null);

                        }



                        @Override

                        public void onAnimationStart(Animator animation) {

                            view.setTag(DOZE_ANIMATOR_TAG, animation);

                        }

                    } /* listener */);

        } else {

            Animator animator = (Animator) view.getTag(DOZE_ANIMATOR_TAG);

            if (animator != null) {

                animator.cancel();

            }

            listener.accept(dark ? 1f : 0f);

        }

    }