diff options
author | Tyler Gunn <tgunn@google.com> | 2015-11-09 12:21:58 -0800 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2015-11-09 17:00:58 -0800 |
commit | de77e317e551f09e94a0caa82448a95ba23f4fa2 (patch) | |
tree | dcc9fafb46023feeaa1a3218d831b31a70b31432 | |
parent | 24ad92950a39af862c676f18e07b88ecde2f4e3b (diff) | |
download | android_packages_apps_InCallUI-de77e317e551f09e94a0caa82448a95ba23f4fa2.tar.gz android_packages_apps_InCallUI-de77e317e551f09e94a0caa82448a95ba23f4fa2.tar.bz2 android_packages_apps_InCallUI-de77e317e551f09e94a0caa82448a95ba23f4fa2.zip |
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
-rw-r--r-- | src/com/android/incallui/StatusBarNotifier.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java index 4d4e3493..89794cdc 100644 --- a/src/com/android/incallui/StatusBarNotifier.java +++ b/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; |