commit c91706e3a37b506745c903bd58ec2c76bf8cbfa6
author Linux Build Service Account <lnxbuild@localhost> Mon Jan 02 22:46:25 2017 -0700
committer Linux Build Service Account <lnxbuild@localhost> Mon Jan 02 22:46:25 2017 -0700
tree a3138c63fa0568bd6b67023959fa7346cf0f0df6
parent 0adb655245789b6ee6dbd7a01d2662128d61ff57
parent fbfb1653bbd0458ca3c68f9c03c257d9d2e0ca41

Promotion of atel.lnx.2.0-00040.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1095023   I64656aa5beaaeeaf62c5c3a5f7d10b07861b1001   IMS-VT: Don't show contact context when video is showing

Change-Id: I541859b3d1a725e9daa1a3632a7b48bb002590b8
CRs-Fixed: 1095023

InCallUI/src/com/android/incallui/CallCardPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 91b67f8..99c8bde 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -258,7 +258,11 @@
 
         if (mInCallContactInteractions != null &&
                 (oldState == InCallState.INCOMING || newState == InCallState.INCOMING)) {
-            ui.showContactContext(newState != InCallState.INCOMING);
+            boolean showIncomingVideo = (primary != null) ? VideoCallPresenter.showIncomingVideo(
+                    primary.getVideoState(), primary.getState()) : false;
+            if (!showIncomingVideo) {
+                ui.showContactContext(newState != InCallState.INCOMING);
+            }
         }
 
         Log.d(this, "Primary call: " + primary);
@@ -660,6 +664,8 @@
     }
 
     private void updateContactInteractions() {
+        boolean showIncomingVideo = (mPrimary != null) ? VideoCallPresenter.showIncomingVideo(
+                mPrimary.getVideoState(), mPrimary.getState()) : false;
         if (mPrimary != null && mPrimaryContactInfo != null
                 && (mPrimaryContactInfo.locationAddress != null
                         || mPrimaryContactInfo.openingHours != null)) {
@@ -675,9 +681,13 @@
                     mDistanceHelper.calculateDistance(mPrimaryContactInfo.locationAddress),
                     mPrimaryContactInfo.openingHours);
             getUi().setContactContextContent(mInCallContactInteractions.getListAdapter());
-            getUi().showContactContext(mPrimary.getState() != State.INCOMING);
+            if (!showIncomingVideo) {
+                getUi().showContactContext(mPrimary.getState() != State.INCOMING);
+            }
         } else {
-            getUi().showContactContext(false);
+            if (!showIncomingVideo) {
+                getUi().showContactContext(false);
+            }
         }
     }