summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-06-14 07:06:44 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-06-14 07:06:44 +0000
commit856451f26b4ecc836c39784c5368cf4ff2f04555 (patch)
treef08c825a6f6871b219a94fa5293ae7f9a792e598
parent9175d7e4501ccbb65cf18d3f01bddb745354954f (diff)
parentcd0ef14a58f74d0417b1213c859d3741ab4882b1 (diff)
downloadplatform_packages_apps_Car_Dialer-856451f26b4ecc836c39784c5368cf4ff2f04555.tar.gz
platform_packages_apps_Car_Dialer-856451f26b4ecc836c39784c5368cf4ff2f04555.tar.bz2
platform_packages_apps_Car_Dialer-856451f26b4ecc836c39784c5368cf4ff2f04555.zip
Snap for 6588207 from cd0ef14a58f74d0417b1213c859d3741ab4882b1 to mainline-release
Change-Id: I9ffee9009cf0eb744ef813c1cac01b1b44c11994
-rw-r--r--src/com/android/car/dialer/ui/activecall/InCallFragment.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/car/dialer/ui/activecall/InCallFragment.java b/src/com/android/car/dialer/ui/activecall/InCallFragment.java
index 42408584..1b70a404 100644
--- a/src/com/android/car/dialer/ui/activecall/InCallFragment.java
+++ b/src/com/android/car/dialer/ui/activecall/InCallFragment.java
@@ -109,16 +109,21 @@ public abstract class InCallFragment extends Fragment {
return;
}
- mNameView.setText(info.getDisplayName());
+ String nameViewText = info.getDisplayName();
+ mNameView.setText(nameViewText);
String phoneNumberLabel = info.getTypeLabel();
if (!phoneNumberLabel.isEmpty()) {
phoneNumberLabel += " ";
}
+
+ String bidiWrappedLabel = phoneNumberLabel + TelecomUtils.getBidiWrappedNumber(
+ TelecomUtils.getFormattedNumber(getContext(), number));
phoneNumberLabel += TelecomUtils.getFormattedNumber(getContext(), number);
+
if (!TextUtils.isEmpty(phoneNumberLabel)
&& !phoneNumberLabel.equals(info.getDisplayName())) {
- mPhoneNumberView.setText(phoneNumberLabel);
+ mPhoneNumberView.setText(bidiWrappedLabel);
mPhoneNumberView.setVisibility(View.VISIBLE);
} else {
mPhoneNumberView.setVisibility(View.GONE);