Display CDMA voice privacy icon on notification bar.
The locked phone icon will be shown for voice privacy call on CDMA for non-hold status(dialing, ongoing etc.)
The onhold icon is same as usual.
This change also update on hold icon to quantum vector drawable resources.
WANT_LGTM=all
Bug: 37529280
Test: StatusBarNotifierTest
PiperOrigin-RevId: 173451922
Change-Id: I71d4c03b6953ca72def339c9c0a77bacbaf145f8
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 4ce4393..bb3ef43 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -624,7 +624,8 @@
* Returns the appropriate icon res Id to display based on the call for which we want to display
* information.
*/
- private int getIconToDisplay(DialerCall call) {
+ @VisibleForTesting
+ public int getIconToDisplay(DialerCall call) {
// Even if both lines are in use, we only show a single item in
// the expanded Notifications UI. It's labeled "Ongoing call"
// (or "On hold" if there's only one call, and it's on hold.)
@@ -633,7 +634,7 @@
// from the foreground call. And if there's a ringing call,
// display that regardless of the state of the other calls.
if (call.getState() == DialerCall.State.ONHOLD) {
- return R.drawable.ic_phone_paused_white_24dp;
+ return R.drawable.quantum_ic_phone_paused_vd_theme_24;
} else if (call.getVideoTech().getSessionModificationState()
== SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST
|| call.isVideoCall()) {
@@ -644,6 +645,8 @@
// helpful hint for users so they know how to get back to the call. For Sprint HD calls, we
// replace this icon with an icon of a phone with a HD badge. This is a carrier requirement.
return R.drawable.ic_hd_call;
+ } else if (call.hasProperty(Details.PROPERTY_HAS_CDMA_VOICE_PRIVACY)) {
+ return R.drawable.quantum_ic_phone_locked_vd_theme_24;
}
// If ReturnToCall is enabled, use the static icon. The animated one will show in the bubble.
if (ReturnToCallController.isEnabled(mContext)