From cfbfbb717d6752b8c8f26a8862a847f70759dc61 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Wed, 11 Apr 2012 16:24:17 +0200
Subject: [PATCH] Fix delay when resuming videoCall

---
 AndroidManifest.xml                     |  1 +
 src/org/linphone/VideoCallActivity.java | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a1b05d19f..73ae15062 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,6 +38,7 @@
 		<activity android:name="org.linphone.LinphoneActivity"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar"
+        		  android:screenOrientation="landscape"
                   android:launchMode="singleTask"
                   android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
                   > <!-- android:alwaysRetainTaskState="true" clearTaskOnLaunch="false"-->
diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index bf1950f56..32b552293 100755
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -29,7 +29,6 @@ import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 import org.linphone.ui.Numpad;
-import org.linphone.ui.ToggleImageButton;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -119,8 +118,7 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
 			
 			public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {
 				// Remove references kept in jni code and restart camera
-				// LinphoneManager.getLc().setPreviewWindow(null);
-				// Commented to remove flicker.
+				 LinphoneManager.getLc().setPreviewWindow(null);
 			}
 		});
 		
@@ -158,18 +156,19 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
 			}
 		});
 		
-		((ToggleImageButton) findViewById(R.id.toggleSpeaker)).setChecked(LinphoneManager.getLc().isSpeakerEnabled());
-		
 		if (!AndroidCameraConfiguration.hasSeveralCameras()) {
 			findViewById(R.id.switch_camera).setVisibility(View.GONE);
 		}
 			
-		findViewById(R.id.toggleMuteMic).setOnClickListener(this);
-		findViewById(R.id.incallNumpadShow).setOnClickListener(this);
-		findViewById(R.id.incallHang).setOnClickListener(this);
-		findViewById(R.id.switch_camera).setOnClickListener(this);
-		findViewById(R.id.conf_simple_pause).setOnClickListener(this);
-		findViewById(R.id.conf_simple_video).setOnClickListener(this);
+		if (Version.isXLargeScreen(this))
+		{
+			findViewById(R.id.toggleMuteMic).setOnClickListener(this);
+			findViewById(R.id.incallNumpadShow).setOnClickListener(this);
+			findViewById(R.id.incallHang).setOnClickListener(this);
+			findViewById(R.id.switch_camera).setOnClickListener(this);
+			findViewById(R.id.conf_simple_pause).setOnClickListener(this);
+			findViewById(R.id.conf_simple_video).setOnClickListener(this);
+		}
 		
 	}