diff options
| author | Andrew Lee <anwlee@google.com> | 2014-10-18 00:34:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-18 00:34:03 +0000 |
| commit | 69a5de2c55b8bbee89e83b5bdba755d165574f83 (patch) | |
| tree | ef8fb02aed19312d48aa44f6c0c3b3ddfc19d562 | |
| parent | 92eb9461efea55d1da036fc6633ac2fe3440de63 (diff) | |
| parent | 78711e6951e7444afa0ae224194824c4dc087337 (diff) | |
am ecac1fe2: am 8930b3af: am c3defe5b: Merge "Update UI based on MANAGE_CONFERENCE capability." into lmp-mr1-dev
* commit 'ecac1fe2ec84afff460cbbb409e55b9590385cff':
Update UI based on MANAGE_CONFERENCE capability.
| -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); } } |