diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-11-09 21:30:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-09 21:30:23 +0000 |
| commit | ff6498aa5b7a5b5773137cb1317f2531c308fa60 (patch) | |
| tree | 7d408072058974e6981df14dfede000701c06a30 | |
| parent | fbe0255079253db0f7c8102ba8fd619feb171b8d (diff) | |
| parent | 2e5cfc1a71942e2ca2c8e469042e82c1b4640476 (diff) | |
| download | InCallUI-ff6498aa5b7a5b5773137cb1317f2531c308fa60.tar.gz | |
Show child number in incoming call notification.
am: 2e5cfc1a71
* commit '2e5cfc1a71942e2ca2c8e469042e82c1b4640476':
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; |