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

Commit 484f837a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Strip formatting from convo senders and title" into rvc-dev am:... 

Merge "Strip formatting from convo senders and title" into rvc-dev am: 954574cf am: 1650966e am: 99c91156 am: b8343272

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817528

Change-Id: Ifabbde8465d4808f6fe9ba86663df6275ce59a64
parents 8e9424a4 b8343272

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

+6 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.internal.util.ContrastColorUtil; 
import java.util.ArrayList;

import java.util.List;

import java.util.Locale;

import java.util.Objects;

import java.util.function.Consumer;

import java.util.regex.Pattern;
@@ -795,7 +796,8 @@ public class ConversationLayout extends FrameLayout 
     */

    @RemotableViewMethod

    public void setConversationTitle(CharSequence conversationTitle) {

        mConversationTitle = conversationTitle;

        // Remove formatting from the title.

        mConversationTitle = conversationTitle != null ? conversationTitle.toString() : null;

    }



    public CharSequence getConversationTitle() {
@@ -1052,6 +1054,9 @@ public class ConversationLayout extends FrameLayout 
                groups.add(currentGroup);

                if (sender == null) {

                    sender = mUser;

                } else {

                    // Remove all formatting from the sender name

                    sender = sender.toBuilder().setName(Objects.toString(sender.getName())).build();

                }

                senders.add(sender);

                currentSenderKey = key;