summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2016-05-06 15:46:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-06 15:46:15 +0000
commit8b25d786674f95034dfcdfff09ea16f8e3869311 (patch)
tree2f689f0c094d55547ad0d1d01a683e1002827f1f /InCallUI
parent43fd36a1b2252814c3aa0768d140ede05c84ea16 (diff)
parentb9d447c6d1088134354d5bacaa9f95bd8ab9af53 (diff)
Merge "IMS-VT: Show upgrade to video notification." into nyc-mr1-dev
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/StatusBarNotifier.java7
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 7d212aa8e..a61620317 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -247,8 +247,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;
@@ -301,8 +304,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);