Format numbers in dialogs and notifications

Bug: 158315798
Bug: 154241156
Test: Manual
Change-Id: I5e1f1746a063a967d74c62d1c90b3e98c06137c5

4 files changed, 8 insertions, 5 deletions

diff --git a/src/com/android/car/dialer/notification/InCallNotificationController.java b/src/com/android/car/dialer/notification/InCallNotificationController.java
index 624f104e..70c4194e 100644
--- a/src/com/android/car/dialer/notification/InCallNotificationController.java
+++ b/src/com/android/car/dialer/notification/InCallNotificationController.java
@@ -32,6 +32,7 @@ import androidx.annotation.StringRes;
 import com.android.car.dialer.R;
 import com.android.car.dialer.log.L;
 import com.android.car.telephony.common.CallDetail;
+import com.android.car.telephony.common.TelecomUtils;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -121,7 +122,7 @@ public final class InCallNotificationController {
         mNotificationBuilder
                 .setFullScreenIntent(getFullscreenIntent(call), /* highPriority= */true)
                 .setLargeIcon((Icon) null)
-                .setContentTitle(number)
+                .setContentTitle(TelecomUtils.getBidiWrappedNumber(number))
                 .setActions(
                         getAction(call, R.string.answer_call,
                                 NotificationService.ACTION_ANSWER_CALL),
@@ -138,7 +139,7 @@ public final class InCallNotificationController {
                     if (mActiveInCallNotifications.contains(callId)) {
                         mNotificationBuilder
                                 .setLargeIcon(pair.second)
-                                .setContentTitle(pair.first);
+                                .setContentTitle(TelecomUtils.getBidiWrappedNumber(pair.first));
 
                         mNotificationManager.notify(
                                 callId,
diff --git a/src/com/android/car/dialer/notification/MissedCallNotificationController.java b/src/com/android/car/dialer/notification/MissedCallNotificationController.java
index 3de1e600..13ac6f70 100644
--- a/src/com/android/car/dialer/notification/MissedCallNotificationController.java
+++ b/src/com/android/car/dialer/notification/MissedCallNotificationController.java
@@ -37,6 +37,7 @@ import com.android.car.dialer.log.L;
 import com.android.car.dialer.ui.TelecomActivity;
 import com.android.car.dialer.ui.TelecomPageTab;
 import com.android.car.telephony.common.PhoneCallLog;
+import com.android.car.telephony.common.TelecomUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -153,7 +154,7 @@ public final class MissedCallNotificationController {
                             .setLargeIcon(pair.second)
                             .setContentTitle(mContext.getResources().getQuantityString(
                                     R.plurals.notification_missed_call, callLogSize, callLogSize))
-                            .setContentText(pair.first)
+                            .setContentText(TelecomUtils.getBidiWrappedNumber(pair.first))
                             .setContentIntent(getContentPendingIntent())
                             .setDeleteIntent(getDeleteIntent())
                             .setOnlyAlertOnce(true)
diff --git a/src/com/android/car/dialer/ui/common/DialerUtils.java b/src/com/android/car/dialer/ui/common/DialerUtils.java
index 5826e42e..390da5bc 100644
--- a/src/com/android/car/dialer/ui/common/DialerUtils.java
+++ b/src/com/android/car/dialer/ui/common/DialerUtils.java
@@ -72,7 +72,7 @@ public class DialerUtils {
             item.setTitle(number.isPrimary()
                     ? context.getString(R.string.primary_number_description, readableLabel)
                     : readableLabel);
-            item.setBody(number.getNumber());
+            item.setBody(TelecomUtils.getBidiWrappedNumber(number.getNumber()));
             item.setOnCheckedChangeListener((i, isChecked) -> {
                 selectedPhoneNumber.clear();
                 selectedPhoneNumber.add(number);
diff --git a/src/com/android/car/dialer/ui/favorite/AddFavoriteFragment.java b/src/com/android/car/dialer/ui/favorite/AddFavoriteFragment.java
index a45d5bc7..56d5311b 100644
--- a/src/com/android/car/dialer/ui/favorite/AddFavoriteFragment.java
+++ b/src/com/android/car/dialer/ui/favorite/AddFavoriteFragment.java
@@ -27,6 +27,7 @@ import com.android.car.dialer.R;
 import com.android.car.dialer.ui.search.ContactResultsFragment;
 import com.android.car.telephony.common.Contact;
 import com.android.car.telephony.common.PhoneNumber;
+import com.android.car.telephony.common.TelecomUtils;
 import com.android.car.ui.AlertDialogBuilder;
 import com.android.car.ui.recyclerview.CarUiContentListItem;
 import com.android.car.ui.recyclerview.CarUiListItem;
@@ -92,7 +93,7 @@ public class AddFavoriteFragment extends ContactResultsFragment {
         mFavoritePhoneNumberList.clear();
         for (PhoneNumber number : phoneNumbers) {
             CarUiContentListItem item = new CarUiContentListItem(CarUiContentListItem.Action.ICON);
-            item.setTitle(number.getNumber());
+            item.setTitle(TelecomUtils.getBidiWrappedNumber(number.getNumber()));
             item.setSupplementalIcon(mFavoriteIcon.getConstantState().newDrawable());
             setFavoriteItemState(item, number);