From 84a1becf7d9a7055f16fc5b0e503e0512dcdfcf1 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Tue, 5 Apr 2016 09:34:34 -0700 Subject: Show "manage conference" for video calls. The existing VT implementation assumed that video conference calling is not supported, and hence that the "manage conference" option could not be shown for a video call. This was based on early requirements, but since the video conference calling has become a requirement for some carriers. Removed the video call check in "shouldShowManageConference" and replaced with a check for fullscreen mode. This ensures that when a video call is in fullscreen immersive mode, the "manage conference" banner is hidden along with the call card. Also added code in "onFullscreenModeChanged" which hides or shows the manage conference option as the user enters and exists full screen mode. Bug: 27616422 Change-Id: Ie23ebe2a0aed2e46166468fa3e833072c0e7a34a --- InCallUI/src/com/android/incallui/CallCardPresenter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '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 00835c8ce..3e3926ba9 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -486,7 +486,7 @@ public class CallCardPresenter extends Presenter } return mPrimary.can(android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE) - && !mPrimary.isVideoCall(mContext); + && !mIsFullscreen; } private void setCallbackNumber() { @@ -1023,6 +1023,7 @@ public class CallCardPresenter extends Presenter } ui.setCallCardVisible(!isFullscreenMode); ui.setSecondaryInfoVisible(!isFullscreenMode); + maybeShowManageConferenceCallButton(); } @Override -- cgit v1.2.3