Merge "Fix RTL-flipped phone number in Conversations" into udc-qpr-dev am: 8238bfd731

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451080

Change-Id: I8aa1e5b94cf06e14a18dcdc3f246b6f30990a3c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matías Hernández
2023-05-31 09:50:35 +00:00
committed by Automerger Merge Worker

View File

@@ -23,6 +23,7 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings;
import android.service.notification.ConversationChannelWrapper;
import android.text.BidiFormatter;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
@@ -132,7 +133,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
CharSequence getTitle(ConversationChannelWrapper conversation) {
ShortcutInfo si = conversation.getShortcutInfo();
return si != null
? si.getLabel()
? BidiFormatter.getInstance().unicodeWrap(si.getLabel())
: conversation.getNotificationChannel().getName();
}