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

Commit 63738290 authored by Steve Elliott's avatar Steve Elliott
Browse files

Always use Shortcut Icon in conversation if available 

Bug: 153751740
Test: manual
Change-Id: Ib1002b53d700d2857f69cd476de79a4e34f90559
parent 527765e4

core/java/android/app/Notification.java

+4 −3
Original line number Diff line number Diff line
@@ -7625,9 +7625,8 @@ public class Notification implements Parcelable 
            }

            boolean isConversationLayout = mConversationType != CONVERSATION_TYPE_LEGACY;

            boolean isImportantConversation = mConversationType == CONVERSATION_TYPE_IMPORTANT;

            Icon largeIcon = isConversationLayout && mShortcutIcon != null

                    ? mShortcutIcon

                    : mBuilder.mN.mLargeIcon;

            Icon conversationIcon = mShortcutIcon;

            Icon largeIcon = mBuilder.mN.mLargeIcon;

            TemplateBindResult bindResult = new TemplateBindResult();

            StandardTemplateParams p = mBuilder.mParams.reset()

                    .hasProgress(false)
@@ -7671,6 +7670,8 @@ public class Notification implements Parcelable 
            contentView.setCharSequence(R.id.status_bar_latest_event_content,

                    "setConversationTitle", conversationTitle);

            if (isConversationLayout) {

                contentView.setIcon(R.id.status_bar_latest_event_content,

                        "setConversationIcon", conversationIcon);

                contentView.setBoolean(R.id.status_bar_latest_event_content,

                        "setIsImportantConversation", isImportantConversation);

            }

core/java/com/android/internal/widget/ConversationLayout.java

+15 −8
Original line number Diff line number Diff line
@@ -480,23 +480,25 @@ public class ConversationLayout extends FrameLayout 
                        // (This usually happens for most 1:1 conversations)

                        conversationText = messagingGroup.getSenderName();

                    }

                    if (mConversationIcon == null) {

                        Icon avatarIcon = messagingGroup.getAvatarIcon();

                        if (avatarIcon == null) {

                            avatarIcon = createAvatarSymbol(conversationText, "", mLayoutColor);

                        }

                        mConversationIcon = avatarIcon;

                    mConversationIconView.setImageIcon(mConversationIcon);

                    }

                    break;

                }

            }

        } else {

            if (mLargeIcon != null) {

            if (mConversationIcon == null && mLargeIcon != null) {

                mConversationIcon = mLargeIcon;

            }

            if (mConversationIcon != null) {

                mConversationIconView.setVisibility(VISIBLE);

                mConversationFacePile.setVisibility(GONE);

                mConversationIconView.setImageIcon(mLargeIcon);

                mConversationIconView.setImageIcon(mConversationIcon);

            } else {

                mConversationIcon = null;

                mConversationIconView.setVisibility(GONE);

                // This will also inflate it!

                mConversationFacePile.setVisibility(VISIBLE);
@@ -709,6 +711,11 @@ public class ConversationLayout extends FrameLayout 
        mLargeIcon = largeIcon;

    }



    @RemotableViewMethod

    public void setConversationIcon(Icon conversationIcon) {

        mConversationIcon = conversationIcon;

    }



    /**

     * Sets the conversation title of this conversation.

     *