diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-05-06 16:02:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-06 16:02:35 +0000 |
| commit | 8f8d7f99d82dd58a76dd9af72ed3deb1e65bd822 (patch) | |
| tree | 6b0c21ab97f0faf34362e29c36c487af90f6f9fd /InCallUI | |
| parent | e59028b6a932b28bbcb3662d40b1b3211072cf3a (diff) | |
| parent | d8c2ac02a65ea28915d8990c005a395ae6d762a2 (diff) | |
Merge "IMS-VT: Show upgrade to video notification." into nyc-mr1-dev am: 8b25d78667
am: d8c2ac02a6
* commit 'd8c2ac02a65ea28915d8990c005a395ae6d762a2':
IMS-VT: Show upgrade to video notification.
Change-Id: I92f4c3c1e6bfbca6a0eb84ccf5a9964f4b7bbf74
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/StatusBarNotifier.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index da553f4a3..7132ff9e0 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -257,8 +257,11 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener, getContentString(call, contactInfo.userType); final String contentTitle = getContentTitle(contactInfo, call); + final boolean isVideoUpgradeRequest = call.getSessionModificationState() + == Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST; final int notificationType; - if (callState == Call.State.INCOMING || callState == Call.State.CALL_WAITING) { + if (callState == Call.State.INCOMING || callState == Call.State.CALL_WAITING + || isVideoUpgradeRequest) { notificationType = NOTIFICATION_INCOMING_CALL; } else { notificationType = NOTIFICATION_IN_CALL; @@ -311,8 +314,6 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener, builder.setLargeIcon(largeIcon); builder.setColor(mContext.getResources().getColor(R.color.dialer_theme_color)); - final boolean isVideoUpgradeRequest = call.getSessionModificationState() - == Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST; if (isVideoUpgradeRequest) { builder.setUsesChronometer(false); addDismissUpgradeRequestAction(builder); |