diff options
author | Tyler Gunn <tgunn@google.com> | 2015-11-09 21:35:22 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-09 21:35:22 +0000 |
commit | cbcec5bf811327a3055273e5ce13737c457f9386 (patch) | |
tree | bd7acc56dd73283acdc46fa054ad26dc878f9ebd /InCallUI | |
parent | 27c5fd518f645a189c933ad08ec0f6b7781f1a67 (diff) | |
parent | b49dd309d602ec23798b136346b5cd5fea6dde68 (diff) |
Show child number in incoming call notification. am: 2e5cfc1a71
am: 8af424c54d
* commit '8af424c54dba1388abb4db929560f19f6e71653d':
Show child number in incoming call notification.
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/StatusBarNotifier.java | 12 |
1 files 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; |