From 1b303b1427384221c25437bf7328af22d66ed4d9 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Mon, 9 Nov 2015 12:21:58 -0800 Subject: Show child number in incoming call notification. Where a child number is present in the call extras, show it using the text "via 650-555-1212" in the second line of the incoming call notification. Bug: 24585039 Change-Id: Ic9827f8518778bf5e9c36235e2e1b6525aba4928 --- InCallUI/src/com/android/incallui/StatusBarNotifier.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index 4d4e3493c..89794cdce 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -430,10 +430,14 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener, boolean isIncomingOrWaiting = call.getState() == Call.State.INCOMING || call.getState() == Call.State.CALL_WAITING; - if (isIncomingOrWaiting && !TextUtils.isEmpty(call.getCallSubject()) && - call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED && - call.isCallSubjectSupported()) { - return call.getCallSubject(); + if (isIncomingOrWaiting && + call.getNumberPresentation() == TelecomManager.PRESENTATION_ALLOWED) { + + if (!TextUtils.isEmpty(call.getChildNumber())) { + return mContext.getString(R.string.child_number, call.getChildNumber()); + } else if (!TextUtils.isEmpty(call.getCallSubject()) && call.isCallSubjectSupported()) { + return call.getCallSubject(); + } } int resId = R.string.notification_ongoing_call; -- cgit v1.2.3