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

Commit 9936a051 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Don't crash the notification bind if the icon fails to resolve." into... 

Merge "Don't crash the notification bind if the icon fails to resolve." into sc-dev am: ccb14ac8 am: bc7b069b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15017666

Change-Id: Iaeb018408b9e6925d6989ca6629de89e9d77b188
parents 21276c3b bc7b069b

core/java/com/android/internal/widget/CachingIconView.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -257,7 +257,7 @@ public class CachingIconView extends ImageView { 
        boolean hasColor = color != ColoredIconHelper.COLOR_INVALID;

        boolean hasColor = color != ColoredIconHelper.COLOR_INVALID;

        if (background == null) {

        if (background == null) {

            // This is the pre-S style -- colored icon with no background.

            // This is the pre-S style -- colored icon with no background.

            if (hasColor) {

            if (hasColor && icon != null) {

                icon.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);

                icon.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);

            }

            }

        } else {

        } else {
@@ -265,7 +265,9 @@ public class CachingIconView extends ImageView { 
            // colorize the icon itself with the background color, creating an inverted effect.

            // colorize the icon itself with the background color, creating an inverted effect.

            if (hasColor) {

            if (hasColor) {

                background.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);

                background.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);

                if (icon != null) {

                    icon.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP);

                    icon.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP);

                }

            } else {

            } else {

                background.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP);

                background.mutate().setColorFilter(mBackgroundColor, PorterDuff.Mode.SRC_ATOP);

            }

            }