diff options
author | Andrew Lee <anwlee@google.com> | 2014-10-17 18:09:42 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-10-17 18:12:30 -0700 |
commit | 6bb77ca0911d17efbaf0385487580631a6e19ab8 (patch) | |
tree | bef728a94488c7cd678ca17674a7b6248b3a21dd /InCallUI | |
parent | aec501c9c29db2ef2f2ac885da1462a5916e32b7 (diff) |
Disable video upgrade if call is on hold.
Bug: 16681502
Change-Id: Icce3f50d1204fd7466e3853dba7d05acef0135ec
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonFragment.java | 5 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonFragment.java b/InCallUI/src/com/android/incallui/CallButtonFragment.java index 64f74ff6f..3324c91e5 100644 --- a/InCallUI/src/com/android/incallui/CallButtonFragment.java +++ b/InCallUI/src/com/android/incallui/CallButtonFragment.java @@ -272,6 +272,11 @@ public class CallButtonFragment } @Override + public void enableChangeToVideoButton(boolean enable) { + mChangeToVideoButton.setEnabled(enable); + } + + @Override public void showSwitchCameraButton(boolean show) { mSwitchCameraButton.setVisibility(show ? View.VISIBLE : View.GONE); } diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index ca4eb8838..c01b55ac0 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -382,10 +382,12 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto final boolean canAdd = call.can(PhoneCapabilities.ADD_CALL); final boolean enableHoldOption = call.can(PhoneCapabilities.HOLD); final boolean supportHold = call.can(PhoneCapabilities.SUPPORT_HOLD); + final boolean isCallOnHold = call.getState() == Call.State.ONHOLD; boolean canVideoCall = call.can(PhoneCapabilities.SUPPORTS_VT_LOCAL) && call.can(PhoneCapabilities.SUPPORTS_VT_REMOTE); ui.showChangeToVideoButton(canVideoCall); + ui.enableChangeToVideoButton(!isCallOnHold); final boolean showMergeOption = call.can(PhoneCapabilities.MERGE_CONFERENCE); final boolean showAddCallOption = canAdd; @@ -396,7 +398,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto final boolean showSwapOption = call.can(PhoneCapabilities.SWAP_CONFERENCE); final boolean showHoldOption = !showSwapOption && (enableHoldOption || supportHold); - ui.setHold(call.getState() == Call.State.ONHOLD); + ui.setHold(isCallOnHold); // If we show video upgrade and add/merge and hold/swap, the overflow menu is needed. final boolean isVideoOverflowScenario = canVideoCall && (showAddCallOption || showMergeOption) && (showHoldOption || showSwapOption); @@ -461,6 +463,7 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto void enableHold(boolean enabled); void showSwapButton(boolean show); void showChangeToVideoButton(boolean show); + void enableChangeToVideoButton(boolean enable); void showSwitchCameraButton(boolean show); void setSwitchCameraButton(boolean isBackFacingCamera); void showAddCallButton(boolean show); |