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

Commit 1370da8b authored Jan 10, 2020 by TreeHugger Robot Committed by Android (Google) Code Review Jan 10, 2020

Merge "Updates Icon type checks in framework to include TYPE_URI_ADAPTIVE_BITMAP"

parents 57b07254 d9e0ead0

core/java/android/widget/RemoteViews.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -565,7 +565,8 @@ public class RemoteViews implements Parcelable, Filter {
	}		}

	private static void visitIconUri(Icon icon, @NonNull Consumer<Uri> visitor) {		private static void visitIconUri(Icon icon, @NonNull Consumer<Uri> visitor) {
	if (icon != null && icon.getType() == Icon.TYPE_URI) {		if (icon != null && (icon.getType() == Icon.TYPE_URI
			\|\| icon.getType() == Icon.TYPE_URI_ADAPTIVE_BITMAP)) {
	visitor.accept(icon.getUri());		visitor.accept(icon.getUri());
	}		}
	}		}

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -307,6 +307,7 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi
	case Icon.TYPE_RESOURCE:		case Icon.TYPE_RESOURCE:
	return a.getResPackage().equals(b.getResPackage()) && a.getResId() == b.getResId();		return a.getResPackage().equals(b.getResPackage()) && a.getResId() == b.getResId();
	case Icon.TYPE_URI:		case Icon.TYPE_URI:
			case Icon.TYPE_URI_ADAPTIVE_BITMAP:
	return a.getUriString().equals(b.getUriString());		return a.getUriString().equals(b.getUriString());
	default:		default:
	return false;		return false;