diff options
author | Cassie(Yitong) Wang <cassieyw@google.com> | 2020-06-11 21:31:06 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-11 21:31:06 +0000 |
commit | 723d115c921b8f2debeab1cbe16e764efa77d42b (patch) | |
tree | 964b8e095c2cb1364ac4b74cfc325079a22fb8a9 | |
parent | 57be2adc462d8026ca28b2819998e85be427761f (diff) | |
parent | b682c4396ed11d26edac9af67eb2dbc9a79a8250 (diff) | |
download | platform_packages_apps_Car_Dialer-723d115c921b8f2debeab1cbe16e764efa77d42b.tar.gz platform_packages_apps_Car_Dialer-723d115c921b8f2debeab1cbe16e764efa77d42b.tar.bz2 platform_packages_apps_Car_Dialer-723d115c921b8f2debeab1cbe16e764efa77d42b.zip |
Format numbers in dialogs and notifications am: b682c4396e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Dialer/+/11818465
Change-Id: I0838c1a641ac9b80eab7d9d11b784299dd349d65
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 05e41e59..d1cb5b0d 100644 --- a/src/com/android/car/dialer/notification/InCallNotificationController.java +++ b/src/com/android/car/dialer/notification/InCallNotificationController.java @@ -31,6 +31,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; @@ -118,7 +119,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), @@ -135,7 +136,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 7e45c89b..715ab5e8 100644 --- a/src/com/android/car/dialer/notification/MissedCallNotificationController.java +++ b/src/com/android/car/dialer/notification/MissedCallNotificationController.java @@ -36,6 +36,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; @@ -151,7 +152,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); |