Merge "DO NOT MERGE: Show number next to incoming call text for HUN" into sc-v2-dev
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index fa10737..46b7473 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -437,6 +437,7 @@
<item type="string" name="no_hfp"/>
<item type="string" name="no_phone_numbers"/>
<item type="string" name="notification_incoming_call"/>
+ <item type="string" name="notification_incoming_call_join_number"/>
<item type="string" name="one"/>
<item type="string" name="one_letters"/>
<item type="string" name="ongoing_conf_title"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 47c2f42..1f2b32d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -180,6 +180,10 @@
<string name="in_call_notification_channel_name">Incoming call notification</string>
<!-- Text for incoming call notification [CHAR LIMIT=40]-->
<string name="notification_incoming_call">Incoming call</string>
+ <!-- Text for incoming call notification with phone number -->
+ <string name="notification_incoming_call_join_number">
+ Incoming call * <xliff:g id="phone_number" example="511">%1$s</xliff:g>
+ </string>
<!-- Name of missed call notification channel in app info [CHAR LIMIT=50] -->
<string name="missed_call_notification_channel_name">Missed call notification</string>
<!-- Title for missed call notification [CHAR LIMIT=40]-->
diff --git a/src/com/android/car/dialer/notification/InCallNotificationController.java b/src/com/android/car/dialer/notification/InCallNotificationController.java
index a386d1f..dc253e4 100644
--- a/src/com/android/car/dialer/notification/InCallNotificationController.java
+++ b/src/com/android/car/dialer/notification/InCallNotificationController.java
@@ -122,6 +122,15 @@
.setLargeIcon(pair.second)
.setContentTitle(TelecomUtils.getBidiWrappedNumber(pair.first));
+ String readableNumber = TelecomUtils.getReadableNumber(
+ mContext, callNumber);
+ if (!TextUtils.equals(readableNumber, pair.first)) {
+ mNotificationBuilder.setContentText(
+ mContext.getString(
+ R.string.notification_incoming_call_join_number,
+ TelecomUtils.getBidiWrappedNumber(readableNumber)));
+ }
+
mNotificationManager.notify(
callNumber,
NOTIFICATION_ID,
