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

Fix delay when resuming videoCall

Browse source
This commit is contained in:
Sylvain Berfini 2012-04-11 16:24:17 +02:00
parent 74cbe2b71c
commit cfbfbb717d
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AndroidManifest.xml
View file

@ -38,6 +38,7 @@
<activity android:name="org.linphone.LinphoneActivity" <activity android:name="org.linphone.LinphoneActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar" android:theme="@android:style/Theme.NoTitleBar"
android:screenOrientation="landscape"
android:launchMode="singleTask" android:launchMode="singleTask"
android:windowSoftInputMode="stateAlwaysHidden|adjustResize" android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
> <!-- android:alwaysRetainTaskState="true" clearTaskOnLaunch="false"--> > <!-- android:alwaysRetainTaskState="true" clearTaskOnLaunch="false"-->

9
src/org/linphone/VideoCallActivity.java
View file

@ -29,7 +29,6 @@ import org.linphone.mediastream.Version;
import org.linphone.mediastream.video.AndroidVideoWindowImpl; import org.linphone.mediastream.video.AndroidVideoWindowImpl;
import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration; import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
import org.linphone.ui.Numpad; import org.linphone.ui.Numpad;
import org.linphone.ui.ToggleImageButton;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
@ -119,8 +118,7 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) { public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {
// Remove references kept in jni code and restart camera // Remove references kept in jni code and restart camera
// LinphoneManager.getLc().setPreviewWindow(null); LinphoneManager.getLc().setPreviewWindow(null);
// Commented to remove flicker.
} }
}); });
@ -158,18 +156,19 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
} }
}); });
((ToggleImageButton) findViewById(R.id.toggleSpeaker)).setChecked(LinphoneManager.getLc().isSpeakerEnabled());
if (!AndroidCameraConfiguration.hasSeveralCameras()) { if (!AndroidCameraConfiguration.hasSeveralCameras()) {
findViewById(R.id.switch_camera).setVisibility(View.GONE); findViewById(R.id.switch_camera).setVisibility(View.GONE);
} }
if (Version.isXLargeScreen(this))
{
findViewById(R.id.toggleMuteMic).setOnClickListener(this); findViewById(R.id.toggleMuteMic).setOnClickListener(this);
findViewById(R.id.incallNumpadShow).setOnClickListener(this); findViewById(R.id.incallNumpadShow).setOnClickListener(this);
findViewById(R.id.incallHang).setOnClickListener(this); findViewById(R.id.incallHang).setOnClickListener(this);
findViewById(R.id.switch_camera).setOnClickListener(this); findViewById(R.id.switch_camera).setOnClickListener(this);
findViewById(R.id.conf_simple_pause).setOnClickListener(this); findViewById(R.id.conf_simple_pause).setOnClickListener(this);
findViewById(R.id.conf_simple_video).setOnClickListener(this); findViewById(R.id.conf_simple_video).setOnClickListener(this);
}
} }