From 3a0cb99605c4caf0092ae6abbc1fac5b8abe5823 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 23 Jan 2014 16:59:39 +0100
Subject: [PATCH] Fix top black bar on tablets + fix echo canceller setting +
 updated ms2

---
 res/layout-sw533dp-land/incall.xml            |   3 +-
 res/layout-sw533dp-land/video.xml             |  20 ++
 res/layout-sw720dp-land/incall.xml            | 179 ++++++++++++++++++
 res/layout-sw720dp-land/main.xml              |   2 +
 res/layout-sw720dp-land/video.xml             |  20 ++
 src/org/linphone/SettingsFragment.java        |   3 +-
 .../EchoCancellerCalibrationFragment.java     |  15 +-
 7 files changed, 226 insertions(+), 16 deletions(-)
 create mode 100644 res/layout-sw533dp-land/video.xml
 create mode 100644 res/layout-sw720dp-land/incall.xml
 create mode 100644 res/layout-sw720dp-land/video.xml

diff --git a/res/layout-sw533dp-land/incall.xml b/res/layout-sw533dp-land/incall.xml
index a821b7a54..111fa177f 100644
--- a/res/layout-sw533dp-land/incall.xml
+++ b/res/layout-sw533dp-land/incall.xml
@@ -14,8 +14,7 @@
             android:id="@+id/fragmentContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:paddingTop="40dp" />
+            android:orientation="horizontal" />
 	
 		<TableLayout 
 	        android:id="@+id/calls"
diff --git a/res/layout-sw533dp-land/video.xml b/res/layout-sw533dp-land/video.xml
new file mode 100644
index 000000000..06ced7910
--- /dev/null
+++ b/res/layout-sw533dp-land/video.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+    <org.linphone.mediastream.video.display.GL2JNIView 
+        android:visibility="visible" 
+        android:layout_height="match_parent" 
+        android:layout_width="match_parent" 
+        android:id="@+id/videoSurface" />
+	
+	<SurfaceView
+	    android:id="@+id/videoCaptureSurface"
+	    android:layout_width="218dp"
+	    android:layout_height="160dp"
+	    android:layout_alignParentBottom="true"
+	    android:layout_alignParentRight="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw720dp-land/incall.xml b/res/layout-sw720dp-land/incall.xml
new file mode 100644
index 000000000..111fa177f
--- /dev/null
+++ b/res/layout-sw720dp-land/incall.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/topLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true">
+
+        <LinearLayout
+            android:id="@+id/fragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal" />
+	
+		<TableLayout 
+	        android:id="@+id/calls"
+	    	android:paddingTop="40dp"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:gravity="top" />
+
+        <fragment
+            android:id="@+id/status"
+            android:name="org.linphone.StatusFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:layout="@layout/status" />
+        
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/switchCamera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:contentDescription="@string/content_description_switch_camera"
+        android:layout_marginTop="40dp"
+        android:visibility="invisible"
+        android:src="@drawable/switch_camera" />
+    
+    <org.linphone.ui.Numpad
+        android:id="@+id/numpad"
+        android:background="@drawable/dialer_alt_background"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="invisible"
+        android:layout_marginBottom="150dp"
+        android:layout_centerInParent="true" />
+
+    <RelativeLayout 
+        android:id="@+id/menu"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        
+	    <LinearLayout
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:layout_alignParentBottom="true"
+	        android:layout_alignParentLeft="true"
+	        android:layout_gravity="bottom"
+	        android:gravity="bottom"
+	        android:orientation="horizontal" >
+	        
+	        <TextView
+		        android:id="@+id/video"
+		        android:background="@drawable/video_off"
+		     	android:text="@string/button_video"
+		     	android:gravity="center"
+		     	android:paddingTop="45dp"
+		     	android:textColor="@drawable/text_incall_button_color"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content" />
+	        
+	        <TextView
+		        android:id="@+id/micro"
+		        android:background="@drawable/micro_on"
+		     	android:text="@string/button_micro"
+		     	android:gravity="center"
+		     	android:paddingTop="45dp"
+		     	android:textColor="@drawable/text_incall_button_color"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content" />
+	        
+	        <TextView
+			    android:id="@+id/speaker"
+			    android:background="@drawable/speaker_off"
+			 	android:text="@string/button_speaker"
+			 	android:gravity="center"
+			 	android:paddingTop="45dp"
+			 	android:textColor="@drawable/text_incall_button_color"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content" />
+           	
+	        <TextView
+	           	android:id="@+id/options"
+	           	android:background="@drawable/options"
+	        	android:text="@string/button_options"
+	        	android:gravity="center"
+	        	android:paddingTop="45dp"
+	        	android:textColor="@drawable/text_incall_button_color"
+	           	android:layout_width="wrap_content"
+	           	android:layout_height="wrap_content" />
+	        
+	        <TextView
+	            android:id="@+id/addCall"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_gravity="bottom"
+	            android:background="@drawable/options_add_call_alt"
+	            android:visibility="gone"
+	            android:gravity="center"
+	            android:paddingTop="45dp"
+	            android:text="@string/button_add_call"
+	            android:textColor="@drawable/text_incall_button_color" />
+		        
+	        <TextView
+	            android:id="@+id/transfer"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:layout_gravity="bottom"
+	            android:background="@drawable/options_transfer"
+	            android:visibility="gone"
+	            android:gravity="center"
+	            android:paddingTop="45dp"
+	            android:text="@string/button_transfer"
+	            android:textColor="@drawable/text_incall_button_color" />
+	        
+	    </LinearLayout>
+	    
+	    <LinearLayout
+	        android:layout_alignParentBottom="true"
+	        android:layout_alignParentRight="true"
+	        android:orientation="horizontal"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content">
+	        
+	        <ImageView
+		        android:id="@+id/conference"
+		        android:visibility="gone"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:contentDescription="@string/content_description_conference"
+		        android:scaleType="fitXY"
+		        android:src="@drawable/conference" />
+	        
+	        <ImageView
+		        android:id="@+id/pause"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:contentDescription="@string/content_description_pause"
+		        android:scaleType="fitXY"
+		        android:src="@drawable/pause_off" />
+	        
+	        <ImageView
+	            android:id="@+id/dialer"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:contentDescription="@string/content_description_numpad"
+	            android:scaleType="fitXY"
+	            android:src="@drawable/dialer_alt" />
+	        
+	        <ImageView
+		        android:id="@+id/hangUp"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:contentDescription="@string/content_description_hang_up"
+		        android:scaleType="fitXY"
+		        android:src="@drawable/hangup" />
+	        
+	    </LinearLayout>
+    
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/res/layout-sw720dp-land/main.xml b/res/layout-sw720dp-land/main.xml
index 84db874be..2fb565d49 100644
--- a/res/layout-sw720dp-land/main.xml
+++ b/res/layout-sw720dp-land/main.xml
@@ -82,12 +82,14 @@
             android:paddingTop="40dp">
         
 	        <LinearLayout
+	            android:orientation="horizontal"
 	            android:id="@+id/fragmentContainer"
 	            android:layout_width="match_parent"
 	            android:layout_height="match_parent"
 	            android:layout_weight="0.67" />
 	        
 	        <LinearLayout
+	            android:orientation="horizontal"
 	            android:id="@+id/fragmentContainer2"
 	            android:visibility="gone"
 	            android:layout_width="match_parent"
diff --git a/res/layout-sw720dp-land/video.xml b/res/layout-sw720dp-land/video.xml
new file mode 100644
index 000000000..48c9ca2b1
--- /dev/null
+++ b/res/layout-sw720dp-land/video.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_frame"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    
+    <org.linphone.mediastream.video.display.GL2JNIView 
+        android:visibility="visible" 
+        android:layout_height="match_parent" 
+        android:layout_width="match_parent" 
+        android:id="@+id/videoSurface" />
+	
+	<SurfaceView
+	    android:id="@+id/videoCaptureSurface"
+	    android:layout_width="290dp"
+	    android:layout_height="240dp"
+	    android:layout_alignParentBottom="true"
+	    android:layout_alignParentRight="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 34d58504e..89c75c7af 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -34,7 +34,6 @@ import org.linphone.core.PayloadType;
 import org.linphone.mediastream.Log;
 import org.linphone.mediastream.Version;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
-import org.linphone.mediastream.video.capture.hwconf.Hacks;
 import org.linphone.setup.SetupActivity;
 import org.linphone.ui.LedPreference;
 import org.linphone.ui.PreferencesListFragment;
@@ -153,7 +152,7 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib
 			}
 		}
 		
-		if (Hacks.hasBuiltInEchoCanceller()) {
+		if (LinphoneManager.getLc().needsEchoCalibration()) {
 			uncheckAndHidePreference(R.string.pref_echo_cancellation_key);
 			hidePreference(R.string.pref_echo_canceller_calibration_key);
 		}
diff --git a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java b/src/org/linphone/setup/EchoCancellerCalibrationFragment.java
index 50cccb09e..90f1a1721 100644
--- a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java
+++ b/src/org/linphone/setup/EchoCancellerCalibrationFragment.java
@@ -23,18 +23,15 @@ import java.net.URL;
 
 import org.linphone.LinphoneManager;
 import org.linphone.LinphoneManager.EcCalibrationListener;
-import org.linphone.LinphoneService;
+import org.linphone.LinphonePreferences;
 import org.linphone.R;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.mediastream.Log;
 
-import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -67,17 +64,11 @@ public class EchoCancellerCalibrationFragment extends Fragment implements EcCali
 
 	@Override
 	public void onEcCalibrationStatus(EcCalibratorStatus status, int delayMs) {
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SetupActivity.instance());
-		SharedPreferences.Editor editor = prefs.edit();
-		
-		Context context = SetupActivity.instance() == null ? LinphoneService.instance().getApplicationContext() : SetupActivity.instance();
-		
 		if (status == EcCalibratorStatus.DoneNoEcho) {
-			editor.putBoolean(context.getString(R.string.pref_echo_cancellation_key), false);
+			LinphonePreferences.instance().setEchoCancellation(false);
 		} else if ((status == EcCalibratorStatus.Done) || (status == EcCalibratorStatus.Failed)) {
-			editor.putBoolean(context.getString(R.string.pref_echo_cancellation_key), true);
+			LinphonePreferences.instance().setEchoCancellation(true);
 		}
-		editor.commit();
 		if (mSendEcCalibrationResult) {
 			sendEcCalibrationResult(status, delayMs);
 		} else {