diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-04-07 00:37:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-07 00:37:24 +0000 |
| commit | 9d7067df15538b56c9dfc9aacff2802cb651cd0a (patch) | |
| tree | 215bb790a12da5b30722005fec90ab087f2ba645 /InCallUI/src/com/android/incallui/CallCardPresenter.java | |
| parent | f20eb6ed1844fa52964187c66e872de46456cb1c (diff) | |
| parent | aab8998d6e38ee771aa5c1ca06691b9bad7c141c (diff) | |
Show "manage conference" for video calls. am: 84a1bec
am: aab8998
* commit 'aab8998d6e38ee771aa5c1ca06691b9bad7c141c':
Show "manage conference" for video calls.
Change-Id: Ic1f3afa1270ded8ad31a52ba1c814231acd3bbed
Diffstat (limited to 'InCallUI/src/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 5cc6bc096..a7d4dd483 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -498,7 +498,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } return mPrimary.can(android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE) - && !mPrimary.isVideoCall(mContext); + && !mIsFullscreen; } private void setCallbackNumber() { @@ -1036,6 +1036,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } ui.setCallCardVisible(!isFullscreenMode); ui.setSecondaryInfoVisible(!isFullscreenMode); + maybeShowManageConferenceCallButton(); } @Override |