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

Commit a3c47e79 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed an issue where the largeIcon wouldn't be shown for non-shortcuts" into rvc-dev

parents 905e01f8 d2dcd465

core/java/android/app/Notification.java

+3 −1
Original line number Diff line number Diff line
@@ -7584,7 +7584,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)