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

Commit 9848a6c4 authored by Mady Mellor's avatar Mady Mellor
Browse files

Documentation & refinements around BubbleMetadata#setIcon API 

Also actually use the icon if we're provided it!

Test: atest NotificationTest
Bug: 128010752
Change-Id: Ide8bcf9af4ed687501afffeca4e9ccf84482042b
parent 40e9a201

core/java/android/app/Notification.java

+15 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.app;



import static android.graphics.drawable.Icon.TYPE_BITMAP;



import static com.android.internal.util.ContrastColorUtil.satisfiesTextContrast;



import android.annotation.ColorInt;
@@ -8705,12 +8707,25 @@ public class Notification implements Parcelable 
             * <p>An icon is required and should be representative of the content within the bubble.

             * If your app produces multiple bubbles, the image should be unique for each of them.

             * </p>

             *

             * <p>The shape of a bubble icon is adaptive and can match the device theme.

             *

             * If your icon is bitmap-based, you should create it using

             * {@link Icon#createWithAdaptiveBitmap(Bitmap)}, otherwise this method will throw.

             *

             * If your icon is not bitmap-based, you should expect that the icon will be tinted.

             * </p>

             */

            @NonNull

            public BubbleMetadata.Builder setIcon(@NonNull Icon icon) {

                if (icon == null) {

                    throw new IllegalArgumentException("Bubbles require non-null icon");

                }

                if (icon.getType() == TYPE_BITMAP) {

                    throw new IllegalArgumentException("When using bitmap based icons, Bubbles "

                            + "require TYPE_ADAPTIVE_BITMAP, please use"

                            + " Icon#createWithAdaptiveBitmap instead");

                }

                mIcon = icon;

                return this;

            }

packages/SystemUI/src/com/android/systemui/bubbles/BubbleView.java

+11 −3
Original line number Diff line number Diff line
@@ -193,11 +193,19 @@ public class BubbleView extends FrameLayout { 
        if (mEntry == null) {

            return;

        }

        Notification.BubbleMetadata metadata = mEntry.getBubbleMetadata();

        Notification n = mEntry.notification.getNotification();

        boolean isLarge = n.getLargeIcon() != null;

        Icon ic = isLarge ? n.getLargeIcon() : n.getSmallIcon();

        Icon ic;

        boolean needsTint;

        if (metadata != null) {

            ic = metadata.getIcon();

            needsTint = ic.getType() != Icon.TYPE_ADAPTIVE_BITMAP;

        } else {

            needsTint = n.getLargeIcon() == null;

            ic = needsTint ? n.getSmallIcon() : n.getLargeIcon();

        }

        Drawable iconDrawable = ic.loadDrawable(mContext);

        if (!isLarge) {

        if (needsTint) {

            // Center icon on coloured background

            iconDrawable.setTint(Color.WHITE); // TODO: dark mode

            Drawable bg = new ColorDrawable(n.color);

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationTestHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ public class NotificationTestHelper { 
                .setIntent(bubbleIntent)

                .setDeleteIntent(deleteIntent)

                .setTitle("bubble title")

                .setIcon(Icon.createWithResource(mContext, 1))

                .setIcon(Icon.createWithResource(mContext, R.drawable.android))

                .setDesiredHeight(314)

                .build();

    }