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

Commit 2ce453ee authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz
Browse files

[SingleLineConversationView] Align avatar logic with ConversationLayout 

While conversationIcon's default is shortcut icon in ConversationLayout, it is not for SingleLineView. That causes inconsistency bw existing ConversationLayout and our new hybrid views.

Fixes: 343213166
Test: Check Messenger group chat icon + check group icon by using Notify
Flag: com.android.systemui.notification_async_hybrid_view_inflation
Change-Id: I047075126d4c5e81cb67073e918f0f4a456a9f4b
parent 102f1f0c

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/SingleLineViewInflater.kt

+1 −5
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ internal object SingleLineViewInflater { 
            return SingleIcon(null)

        }

        val userKey = user.getKeyOrName()

        var conversationIcon: Icon? = null

        var conversationIcon: Icon? = shortcutIcon

        var conversationText: CharSequence? = conversationTitle



        val groups = groupMessages(messages, historicMessages)
@@ -253,10 +253,6 @@ internal object SingleLineViewInflater { 
        if (!isGroupConversation) {

            // Conversation is one-to-one, load the single icon

            // Let's resolve the icon / text from the last sender

            if (shortcutIcon != null) {

                conversationIcon = shortcutIcon

            }



            for (i in messages.lastIndex downTo 0) {

                val message = messages[i]

                val sender = message.senderPerson