diff options
| author | Andrew Lee <anwlee@google.com> | 2014-10-20 17:26:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-20 17:26:00 +0000 |
| commit | f5453d487077967f5cd528827382a723645fe463 (patch) | |
| tree | f09e474afa8e8a02bf979589ca0166dd96090bb1 /InCallUI | |
| parent | 43f19ec350f1fbde783ba4e34edc3624993d7061 (diff) | |
| parent | 6bb77ca0911d17efbaf0385487580631a6e19ab8 (diff) | |
Merge "Disable video upgrade if call is on hold." into lmp-mr1-dev
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 0d7d88fcf..e630cf896 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -384,10 +384,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; @@ -398,7 +400,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); @@ -463,6 +465,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); |