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

Commit d2dcd465 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed an issue where the largeIcon wouldn't be shown for non-shortcuts 

We should only use the shortcut icon if it's available

Bug: 150905003
Test: add group message from Notify with largeIcon
Change-Id: Icd5b0991b34fbfb517344cc6c908a2588973cdca
parent ecf248f6

core/java/android/app/Notification.java

+3 −1
Original line number Diff line number Diff line
@@ -7585,7 +7585,9 @@ public class Notification implements Parcelable 
            }

            boolean isConversationLayout = mConversationType != CONVERSATION_TYPE_LEGACY;

            boolean isImportantConversation = mConversationType == CONVERSATION_TYPE_IMPORTANT;

            Icon largeIcon = isConversationLayout ? mShortcutIcon : mBuilder.mN.mLargeIcon;

            Icon largeIcon = isConversationLayout && mShortcutIcon != null

                    ? mShortcutIcon

                    : mBuilder.mN.mLargeIcon;

            TemplateBindResult bindResult = new TemplateBindResult();

            StandardTemplateParams p = mBuilder.mParams.reset()

                    .hasProgress(false)