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

Fix back and incall controls if call is paused

Browse source
This commit is contained in:
Sylvain Berfini 2012-05-11 15:20:04 +02:00
parent b3798a436c
commit 3da20210ba
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/org/linphone/DialerActivity.java
View file

@ -516,13 +516,14 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
if (AndroidCameraConfiguration.hasSeveralCameras() && mSwitchCamera != null) if (AndroidCameraConfiguration.hasSeveralCameras() && mSwitchCamera != null)
mSwitchCamera.setVisibility(View.VISIBLE); mSwitchCamera.setVisibility(View.VISIBLE);
if (mVideoCaptureView != null && mCamera == null && !LinphoneManager.getLc().isIncall()) boolean isInCall = LinphoneManager.getLc().isIncall();
{ isInCall = isInCall || LinphoneManager.getLc().getCallsNb() > 0;
if (mVideoCaptureView != null && mCamera == null && !LinphoneManager.getLc().isIncall()) {
mCamera = Camera.open(mCurrentCameraId); mCamera = Camera.open(mCurrentCameraId);
mVideoCaptureView.switchCamera(mCamera, mCurrentCameraId); mVideoCaptureView.switchCamera(mCamera, mCurrentCameraId);
mCamera.startPreview(); mCamera.startPreview();
} else if (LinphoneManager.getLc().isIncall()) } else if (isInCall) {
{
if (mInCallControls != null) { if (mInCallControls != null) {
mInCallControls.setVisibility(View.VISIBLE); mInCallControls.setVisibility(View.VISIBLE);
mCall.setVisibility(View.GONE); mCall.setVisibility(View.GONE);
@ -537,7 +538,9 @@ public class DialerActivity extends Activity implements LinphoneGuiListener {
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
if (LinphoneUtils.onKeyVolumeSoftAdjust(keyCode)) return true; if (LinphoneUtils.onKeyVolumeSoftAdjust(keyCode)) return true;
if (keyCode == KeyEvent.KEYCODE_BACK && LinphoneManager.getLc().isIncall()) { boolean isInCall = LinphoneManager.getLc().isIncall();
isInCall = isInCall || LinphoneManager.getLc().getCallsNb() > 0;
if (keyCode == KeyEvent.KEYCODE_BACK && isInCall) {
// If we are in call on dialer, we go back to the incall view // If we are in call on dialer, we go back to the incall view
LinphoneActivity.instance().startIncallActivity(); LinphoneActivity.instance().startIncallActivity();
return true; return true;