Merge "Fix RTL-flipped phone number in Conversations" into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8238bfd731
@@ -23,6 +23,7 @@ import android.os.Bundle;
|
|||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
import android.service.notification.ConversationChannelWrapper;
|
import android.service.notification.ConversationChannelWrapper;
|
||||||
|
import android.text.BidiFormatter;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
@@ -132,7 +133,7 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
|
|||||||
CharSequence getTitle(ConversationChannelWrapper conversation) {
|
CharSequence getTitle(ConversationChannelWrapper conversation) {
|
||||||
ShortcutInfo si = conversation.getShortcutInfo();
|
ShortcutInfo si = conversation.getShortcutInfo();
|
||||||
return si != null
|
return si != null
|
||||||
? si.getLabel()
|
? BidiFormatter.getInstance().unicodeWrap(si.getLabel())
|
||||||
: conversation.getNotificationChannel().getName();
|
: conversation.getNotificationChannel().getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user