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 | 758739a7d9daa296262079bf802e0a2f41dbe1b4 (patch) | |
tree | c8c6283de35e7b4703cd79c27764da1ab1d4d249 | |
parent | e7eddd946a6517163bd0d3baaa643e7e18043373 (diff) | |
parent | 8af424c54dba1388abb4db929560f19f6e71653d (diff) | |
download | InCallUI-758739a7d9daa296262079bf802e0a2f41dbe1b4.tar.gz |
Show child number in incoming call notification. am: 2e5cfc1a71
am: 8af424c54d
* commit '8af424c54dba1388abb4db929560f19f6e71653d':
Show child number in incoming call notification.
-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; |