diff options
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/AnswerPresenter.java | 1 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index 2bd3629e7..6757268f3 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -57,6 +57,7 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> call = calls.getVideoUpgradeRequestCall(); Log.d(this, "getVideoUpgradeRequestCall call =" + call); if (call != null) { + showAnswerUi(true); processVideoUpgradeRequestCall(call); } } else { 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<CallCardPresenter.CallCardUi> } 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<CallCardPresenter.CallCardUi> } ui.setCallCardVisible(!isFullscreenMode); ui.setSecondaryInfoVisible(!isFullscreenMode); + maybeShowManageConferenceCallButton(); } @Override |