From cc069789b929ab44fc2e51e5270ebb35a0de1ff2 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 20 Jan 2016 16:55:07 +0100
Subject: [PATCH] Fix video resized in full screen

---
 res/layout/call.xml          | 66 ++++++++++++++++++------------------
 res/layout/call_incoming.xml | 12 +++----
 res/layout/call_outgoing.xml |  4 +--
 res/values/strings.xml       |  1 +
 4 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/res/layout/call.xml b/res/layout/call.xml
index cd0de6e2c..971faa570 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -5,19 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-	<fragment
-		android:id="@+id/status"
-		android:name="org.linphone.StatusFragment"
-		android:layout_width="match_parent"
-		android:layout_height="40dp"
-		tools:layout="@layout/status" />
-
-
 	<android.support.v4.widget.DrawerLayout
 		android:id="@+id/side_menu"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_below="@id/status">
+		android:layout_height="match_parent">
 
 		<RelativeLayout
 			android:layout_width="match_parent"
@@ -28,7 +19,7 @@
 				android:id="@+id/fragmentContainer"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
-				android:orientation="horizontal" />
+				android:orientation="horizontal"/>
 
 			<FrameLayout
 				android:layout_width="match_parent"
@@ -37,7 +28,8 @@
 
 				<RelativeLayout
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content">
+					android:layout_height="wrap_content"
+					android:layout_marginTop="40dp">
 
 					<LinearLayout
 						android:id="@+id/conference_list"
@@ -193,18 +185,6 @@
 				</RelativeLayout>
 			</FrameLayout>
 
-			<org.linphone.ui.Numpad
-				android:id="@+id/numpad"
-				android:background="@color/colorF"
-				android:contentDescription="@string/content_description_numpad"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:visibility="gone"
-				android:layout_margin="10dp"
-				android:layout_above="@id/menu"
-				android:layout_centerHorizontal="true"
-				android:layout_centerVertical="true"/>
-
 			<LinearLayout
 				android:id="@+id/menu"
 				android:layout_width="wrap_content"
@@ -295,7 +275,7 @@
 						android:background="@color/colorC"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_weight="1"
+						android:layout_weight="0.8"
 						android:padding="18dp" />
 
 					<ImageView
@@ -305,7 +285,7 @@
 						android:layout_gravity="center"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_weight="0.5"
+						android:layout_weight="0.4"
 						android:padding="15dp"/>
 
 					<ImageView
@@ -314,7 +294,7 @@
 						android:background="@color/colorC"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_weight="1"
+						android:layout_weight="0.8"
 						android:padding="18dp"/>
 				</LinearLayout>
 
@@ -343,7 +323,7 @@
 					android:id="@+id/route_bluetooth"
 					android:src="@drawable/route_bluetooth"
 					android:background="@drawable/button_background"
-					android:padding="20dp"
+					android:padding="15dp"
 					android:visibility="invisible"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -353,7 +333,7 @@
 					android:id="@+id/add_call"
 					android:src="@drawable/options_add_call"
 					android:background="@drawable/button_background"
-					android:padding="20dp"
+					android:padding="15dp"
 					android:visibility="invisible"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -384,7 +364,7 @@
 					android:id="@+id/route_earpiece"
 					android:src="@drawable/route_earpiece"
 					android:background="@drawable/button_background"
-					android:padding="20dp"
+					android:padding="15dp"
 					android:visibility="invisible"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -394,7 +374,7 @@
 					android:id="@+id/transfer"
 					android:src="@drawable/options_transfer_call"
 					android:background="@drawable/button_background"
-					android:padding="20dp"
+					android:padding="15dp"
 					android:visibility="invisible"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -425,7 +405,7 @@
 					android:src="@drawable/route_speaker"
 					android:background="@drawable/button_background"
 					android:visibility="invisible"
-					android:padding="20dp"
+					android:padding="15dp"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_weight="0.5"/>
@@ -435,7 +415,7 @@
 					android:src="@drawable/options_start_conference"
 					android:background="@drawable/button_background"
 					android:visibility="invisible"
-					android:padding="20dp"
+					android:padding="15dp"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_weight="0.5"/>
@@ -444,9 +424,22 @@
 
 		</RelativeLayout>
 
+		<org.linphone.ui.Numpad
+			android:id="@+id/numpad"
+			android:background="@color/colorF"
+			android:contentDescription="@string/content_description_numpad"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:visibility="gone"
+			android:layout_margin="10dp"
+			android:layout_above="@id/menu"
+			android:layout_centerHorizontal="true"
+			android:layout_centerVertical="true"/>
+
 		<RelativeLayout
 			android:id="@+id/side_menu_content"
 			android:background="@color/colorH"
+			android:layout_marginTop="40dp"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:layout_gravity="left">
@@ -457,4 +450,11 @@
 
 	</android.support.v4.widget.DrawerLayout>
 
+	<fragment
+		android:id="@+id/status"
+		android:name="org.linphone.StatusFragment"
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		tools:layout="@layout/status" />
+
 </RelativeLayout>
diff --git a/res/layout/call_incoming.xml b/res/layout/call_incoming.xml
index 2b7ee03ea..633af3068 100644
--- a/res/layout/call_incoming.xml
+++ b/res/layout/call_incoming.xml
@@ -1,10 +1,10 @@
 <?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"
-				android:background="@color/colorH">
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/topLayout"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/colorH">
 
 	<fragment
 		android:id="@+id/status"
@@ -86,7 +86,7 @@
 	<LinearLayout
 		android:id="@+id/menu"
 		android:layout_width="match_parent"
-		android:layout_height="70dp"
+		android:layout_height="60dp"
 		android:layout_alignParentBottom="true"
 		android:orientation="horizontal" >
 
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index 22575c3be..b7a0fa3f5 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -94,7 +94,7 @@
 	<LinearLayout
 		android:id="@+id/menu"
 		android:layout_width="match_parent"
-		android:layout_height="70dp"
+		android:layout_height="60dp"
 		android:layout_alignParentBottom="true"
 		android:layout_alignParentLeft="true"
 		android:orientation="horizontal" >
@@ -117,7 +117,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="20dp"/>
+			android:padding="18dp"/>
 
 		<ImageView
 			android:id="@+id/outgoing_hang_up"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7866bd853..ea240a806 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -48,6 +48,7 @@
 	<string name="settings">Settings</string>
 	<string name="connect">Connection</string>
 	<string name="decline">Decline</string>
+	<string name="conference">Conference</string>
 
 	<!-- Launch screen -->
 	<string name="app_description">the libre SIP client</string>