From a83c57ff7348cb372b53c662e9b005141fd5cdc6 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 27 Apr 2026 11:51:50 -0300 Subject: [PATCH] Use adaptive bitmap for dynamic shortcut icons to remove white border. Co-authored-by: Greyson Parrelli --- .../org/thoughtcrime/securesms/util/AvatarUtil.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java index 0da6f69848..51b8699a22 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java @@ -127,12 +127,17 @@ public final class AvatarUtil { */ @WorkerThread public static @NonNull IconCompat getIconCompatForShortcut(@NonNull Context context, @NonNull Recipient recipient) { - int size = AdaptiveBitmapMetrics.getInnerWidth(); + int size = AdaptiveBitmapMetrics.getInnerWidth(); + Bitmap inner; + if (recipient.isSelf()) { - Drawable noteToSelfDrawable = getNoteToSelfDrawable(context, recipient.getAvatarColor(), size); - return IconCompat.createWithBitmap(DrawableUtil.toBitmap(noteToSelfDrawable, size, size)); + inner = DrawableUtil.toBitmap(getNoteToSelfDrawable(context, recipient.getAvatarColor(), size), size, size); + } else { + inner = getBitmapForNotification(context, recipient, size); } - return IconCompat.createWithBitmap(getBitmapForNotification(context, recipient, size)); + + Bitmap wrapped = DrawableUtil.wrapBitmapForShortcutInfo(inner); + return IconCompat.createWithAdaptiveBitmap(wrapped); } @WorkerThread