From 4e2a865b003b1391593a70768ae7c7f33c91c45c Mon Sep 17 00:00:00 2001
From: Brieuc Viel <brieuc.viel@belledonne-communications.com>
Date: Mon, 2 May 2016 14:25:22 +0200
Subject: [PATCH] [UI] call + video call ui updated

---
 AndroidManifest.xml                   |  3 ++-
 linphone-android-obiane.iml           |  2 ++
 res/layout-land/call.xml              |  1 -
 res/layout-land/video.xml             | 20 ++++++++++++++++++++
 res/layout-sw533dp-land/call.xml      |  1 -
 res/layout-sw533dp/call.xml           |  1 -
 src/org/linphone/LinphoneManager.java |  1 +
 7 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 res/layout-land/video.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e92779c0..3b298e64e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,6 +28,7 @@
 	<uses-permission android:name="android.permission.READ_LOGS" />
 	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
 	<!-- Needed to store received images if the user wants to -->
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 	<!-- Needed to use our own Contact editor -->
 	<uses-permission android:name="android.permission.WRITE_CONTACTS"/>
@@ -43,7 +44,7 @@
 
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
     
-    <application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:largeHeap="true" android:allowBackup="false">
+    <application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:largeHeap="true" android:allowBackup="false" android:debuggable="true">
 
 		<activity android:name="org.linphone.LinphoneLauncherActivity"
 		    android:label="@string/app_name"
diff --git a/linphone-android-obiane.iml b/linphone-android-obiane.iml
index d2ae187b0..e187720d0 100644
--- a/linphone-android-obiane.iml
+++ b/linphone-android-obiane.iml
@@ -71,6 +71,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
@@ -81,6 +82,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml
index 1d9cd7ebb..1d2f8b196 100644
--- a/res/layout-land/call.xml
+++ b/res/layout-land/call.xml
@@ -43,7 +43,6 @@
 
 					<RelativeLayout
 						android:id="@+id/active_call"
-						android:background="@color/colorA"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:visibility="visible">
diff --git a/res/layout-land/video.xml b/res/layout-land/video.xml
new file mode 100644
index 000000000..207405d19
--- /dev/null
+++ b/res/layout-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="145dp"
+	    android:layout_height="120dp"
+	    android:layout_alignParentBottom="true"
+	    android:layout_alignParentRight="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp-land/call.xml b/res/layout-sw533dp-land/call.xml
index 0a4cabf75..e8c3cb723 100644
--- a/res/layout-sw533dp-land/call.xml
+++ b/res/layout-sw533dp-land/call.xml
@@ -43,7 +43,6 @@
 
 					<RelativeLayout
 						android:id="@+id/active_call"
-						android:background="@color/colorA"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
                         android:layout_above="@id/menu"
diff --git a/res/layout-sw533dp/call.xml b/res/layout-sw533dp/call.xml
index 13cfde375..7d03b6a7f 100644
--- a/res/layout-sw533dp/call.xml
+++ b/res/layout-sw533dp/call.xml
@@ -43,7 +43,6 @@
 
 					<RelativeLayout
 						android:id="@+id/active_call"
-						android:background="@color/colorA"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:visibility="visible">
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index dc0ed5d1c..495d241cb 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -604,6 +604,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 	}
 
 	public void restartLinphoneCore(){
+
 		destroyLinphoneCore();
 		startLibLinphone(mServiceContext);
 		sExited = false;