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

Commit dacc924a authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Reinspect notification for dark mode when updated 

Also protect against a crash that might happen when the notification
is updated during an animation.

Bug: 18572620
Change-Id: Ifd6279df395974f7afd0c708a6c87c64de935c62
parent 10ad761a

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

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ public class NotificationContentView extends FrameLayout { 
    public void notifyContentUpdated() {

        selectLayout(false /* animate */, true /* force */);

        if (mContractedChild != null) {

            mContractedWrapper.notifyContentUpdated();

            mContractedWrapper.setDark(mDark, false /* animate */, 0 /* delay */);

        }

    }

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

+28 −8
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.graphics.ColorMatrix; 
import android.graphics.ColorMatrixColorFilter;

import android.graphics.PorterDuff;

import android.graphics.PorterDuffColorFilter;

import android.graphics.drawable.Drawable;

import android.view.View;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;
@@ -40,17 +41,18 @@ import com.android.systemui.statusbar.phone.NotificationPanelView; 
 */

public class NotificationTemplateViewWrapper extends NotificationViewWrapper {



    private final ViewInvertHelper mInvertHelper;

    private final ImageView mIcon;

    protected final ImageView mPicture;

    private final ColorMatrix mGrayscaleColorMatrix = new ColorMatrix();

    private final PorterDuffColorFilter mIconColorFilter = new PorterDuffColorFilter(

            0, PorterDuff.Mode.SRC_ATOP);

    private final int mIconDarkAlpha;

    private final int mIconBackgroundColor;

    private final int mIconBackgroundDarkColor;

    private final Interpolator mLinearOutSlowInInterpolator;



    private int mIconBackgroundColor;

    private ViewInvertHelper mInvertHelper;

    private ImageView mIcon;

    protected ImageView mPicture;



    protected NotificationTemplateViewWrapper(Context ctx, View view) {

        super(view);

        mIconDarkAlpha = ctx.getResources().getInteger(R.integer.doze_small_icon_alpha);
@@ -58,12 +60,16 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper { 
                ctx.getResources().getColor(R.color.doze_small_icon_background_color);

        mLinearOutSlowInInterpolator = AnimationUtils.loadInterpolator(ctx,

                android.R.interpolator.linear_out_slow_in);

        View mainColumn = view.findViewById(com.android.internal.R.id.notification_main_column);

        resolveViews();

    }



    private void resolveViews() {

        View mainColumn = mView.findViewById(com.android.internal.R.id.notification_main_column);

        mInvertHelper = mainColumn != null

                ? new ViewInvertHelper(mainColumn, NotificationPanelView.DOZE_ANIMATION_DURATION)

                : null;

        ImageView largeIcon = (ImageView) view.findViewById(com.android.internal.R.id.icon);

        ImageView rightIcon = (ImageView) view.findViewById(com.android.internal.R.id.right_icon);

        ImageView largeIcon = (ImageView) mView.findViewById(com.android.internal.R.id.icon);

        ImageView rightIcon = (ImageView) mView.findViewById(com.android.internal.R.id.right_icon);

        mIcon = resolveIcon(largeIcon, rightIcon);

        mPicture = resolvePicture(largeIcon);

        mIconBackgroundColor = resolveBackgroundColor(mIcon);
@@ -91,6 +97,14 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper { 
        return 0;

    }



    @Override

    public void notifyContentUpdated() {

        super.notifyContentUpdated();



        // Reinspect the notification.

        resolveViews();

    }



    @Override

    public void setDark(boolean dark, boolean fade, long delay) {

        if (mInvertHelper != null) {
@@ -180,7 +194,13 @@ public class NotificationTemplateViewWrapper extends NotificationViewWrapper { 
    private void updateIconColorFilter(ImageView target, float intensity) {

        int color = interpolateColor(mIconBackgroundColor, mIconBackgroundDarkColor, intensity);

        mIconColorFilter.setColor(color);

        target.getBackground().mutate().setColorFilter(mIconColorFilter);

        Drawable background = target.getBackground();



        // The notification might have been modified during the animation, so background might be

        // null here.

        if (background != null) {

            background.mutate().setColorFilter(mIconColorFilter);

        }

    }



    private void updateIconAlpha(ImageView target, boolean dark) {

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

+5 −0
Original line number Diff line number Diff line
@@ -53,4 +53,9 @@ public abstract class NotificationViewWrapper { 
     * @param delay if fading, the delay of the animation

     */

    public abstract void setDark(boolean dark, boolean fade, long delay);



    /**

     * Notifies this wrapper that the content of the view might have changed.

     */

    public void notifyContentUpdated() {}

}