Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disable video button in pause

Browse source
This commit is contained in:
Margaux Clerc 2014-07-08 11:57:43 +02:00
parent e7569a342a
commit 06054d11bc
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/org/linphone/InCallActivity.java
View file

@ -91,7 +91,7 @@ public class InCallActivity extends FragmentActivity implements
private StatusFragment status; private StatusFragment status;
private AudioCallFragment audioCallFragment; private AudioCallFragment audioCallFragment;
private VideoCallFragment videoCallFragment; private VideoCallFragment videoCallFragment;
private boolean isSpeakerEnabled = false, isMicMuted = false, isVideoEnabled, isTransferAllowed, isAnimationDisabled; private boolean isSpeakerEnabled = false, isMicMuted = false, isVideoEnabled, isPaused = false, isTransferAllowed, isAnimationDisabled;
private ViewGroup mControlsLayout; private ViewGroup mControlsLayout;
private Numpad numpad; private Numpad numpad;
private int cameraNumber; private int cameraNumber;
@ -310,7 +310,7 @@ public class InCallActivity extends FragmentActivity implements
} else { } else {
micro.setBackgroundResource(R.drawable.micro_on); micro.setBackgroundResource(R.drawable.micro_on);
} }
if (LinphoneManager.getLc().getCallsNb() > 1) { if (LinphoneManager.getLc().getCallsNb() > 1) {
conference.setVisibility(View.VISIBLE); conference.setVisibility(View.VISIBLE);
pause.setVisibility(View.GONE); pause.setVisibility(View.GONE);
@ -325,6 +325,13 @@ public class InCallActivity extends FragmentActivity implements
pause.setBackgroundResource(R.drawable.pause_off); pause.setBackgroundResource(R.drawable.pause_off);
} }
} }
if(isPaused){
video.setEnabled(false);
} else {
video.setEnabled(true);
}
} }
}); });
} }
@ -364,10 +371,10 @@ public class InCallActivity extends FragmentActivity implements
if (isVideoEnabled) { if (isVideoEnabled) {
displayVideoCallControlsIfHidden(); displayVideoCallControlsIfHidden();
} }
if (id == R.id.video) { if (id == R.id.video) {
isVideoEnabled = !isVideoEnabled; isVideoEnabled = !isVideoEnabled;
switchVideo(isVideoEnabled, true); switchVideo(isVideoEnabled, true);
} }
else if (id == R.id.micro) { else if (id == R.id.micro) {
toggleMicro(); toggleMicro();
@ -1055,7 +1062,16 @@ public class InCallActivity extends FragmentActivity implements
return; return;
} }
if (state == State.Paused || state == State.PausedByRemote || state == State.Pausing) {
isPaused = true;
}
if (state == State.Resuming) {
isPaused = false;
}
if (state == State.StreamsRunning) { if (state == State.StreamsRunning) {
isPaused = false;
boolean isVideoEnabledInCall = call.getCurrentParamsCopy().getVideoEnabled(); boolean isVideoEnabledInCall = call.getCurrentParamsCopy().getVideoEnabled();
if (isVideoEnabledInCall != isVideoEnabled) { if (isVideoEnabledInCall != isVideoEnabled) {
isVideoEnabled = isVideoEnabledInCall; isVideoEnabled = isVideoEnabledInCall;