diff options
| author | Andrew Lee <anwlee@google.com> | 2014-10-18 00:17:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-18 00:17:34 +0000 |
| commit | 23352c4b463759fa8b87cc29d41b579c40797311 (patch) | |
| tree | ef8fb02aed19312d48aa44f6c0c3b3ddfc19d562 /InCallUI | |
| parent | f21271db705a10eadae869b24deb00265a5a48dd (diff) | |
| parent | e0ec202ff354be3cd3bded7af8fca678dea7fb61 (diff) | |
Merge "Update UI based on MANAGE_CONFERENCE capability." into lmp-mr1-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 5 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java | 20 |
2 files changed, 17 insertions, 8 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index f4568ef6d..ac85019bc 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -264,6 +264,11 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> @Override public void onDetailsChanged(Call call, android.telecom.Call.Details details) { updatePrimaryCallState(); + + if (call.can(PhoneCapabilities.MANAGE_CONFERENCE) != PhoneCapabilities.can( + details.getCallCapabilities(), PhoneCapabilities.MANAGE_CONFERENCE)) { + maybeShowManageConferenceCallButton(); + } } private String getSubscriptionNumber() { diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java index 555048da1..f754fdec8 100644 --- a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java +++ b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java @@ -81,16 +81,20 @@ public class ConferenceManagerPresenter boolean canSeparate = PhoneCapabilities.can( details.getCallCapabilities(), PhoneCapabilities.SEPARATE_FROM_CONFERENCE); - if (call.can(PhoneCapabilities.DISCONNECT_FROM_CONFERENCE) == canDisconnect - && call.can(PhoneCapabilities.SEPARATE_FROM_CONFERENCE) == canSeparate) { - return; + if (call.can(PhoneCapabilities.DISCONNECT_FROM_CONFERENCE) != canDisconnect + || call.can(PhoneCapabilities.SEPARATE_FROM_CONFERENCE) != canSeparate) { + for (int i = 0; i < mCallerIds.length; i++) { + if (mCallerIds[i] == call.getId()) { + getUi().updateSeparateButtonForRow(i, canSeparate); + getUi().updateEndButtonForRow(i, canDisconnect); + break; + } + } } - for (int i = 0; i < mCallerIds.length; i++) { - if (mCallerIds[i] == call.getId()) { - getUi().updateSeparateButtonForRow(i, canSeparate); - getUi().updateEndButtonForRow(i, canDisconnect); - } + if (!PhoneCapabilities.can( + details.getCallCapabilities(), PhoneCapabilities.MANAGE_CONFERENCE)) { + getUi().setVisible(false); } } |