commit aab8998d6e38ee771aa5c1ca06691b9bad7c141c
author Tyler Gunn <tgunn@google.com> Thu Apr 07 00:31:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 07 00:31:51 2016 +0000
tree ef076647160c27384d34720b1f506c41476e1970
parent 765e704e96be51de891c2623f82fffc9dab3d202
parent 84a1becf7d9a7055f16fc5b0e503e0512dcdfcf1

Show "manage conference" for video calls.
am: 84a1bec

* commit '84a1becf7d9a7055f16fc5b0e503e0512dcdfcf1':
  Show "manage conference" for video calls.

Change-Id: Ie59da73076ee1f713f66dd2467a568c699286a2f

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 00835c8..3e3926b 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -486,7 +486,7 @@
         }
 
         return mPrimary.can(android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE)
-                && !mPrimary.isVideoCall(mContext);
+                && !mIsFullscreen;
     }
 
     private void setCallbackNumber() {
@@ -1023,6 +1023,7 @@
         }
         ui.setCallCardVisible(!isFullscreenMode);
         ui.setSecondaryInfoVisible(!isFullscreenMode);
+        maybeShowManageConferenceCallButton();
     }
 
     @Override