From d9fe5be0631aaadd8764e67c4c3dce27cee76cf8 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 2 Mar 2016 17:53:34 +0100
Subject: [PATCH] Fix video call button

---
 res/layout-land/call.xml           | 5 ++---
 res/layout-land/call_outgoing.xml  | 6 +++---
 res/layout/call.xml                | 1 -
 src/org/linphone/CallActivity.java | 2 ++
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml
index 1a1085b61..0441dccc4 100644
--- a/res/layout-land/call.xml
+++ b/res/layout-land/call.xml
@@ -257,7 +257,6 @@
 					android:orientation="horizontal">
 
 					<RelativeLayout
-						android:background="@drawable/button_background"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:layout_weight="1">
@@ -304,7 +303,7 @@
 						android:src="@drawable/routes_default"
 						android:background="@drawable/button_background"
 						android:visibility="gone"
-						android:padding="15dp"
+						android:padding="20dp"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:layout_weight="1" />
@@ -428,7 +427,7 @@
 					android:src="@drawable/route_speaker"
 					android:background="@drawable/button_background"
 					android:visibility="invisible"
-					android:padding="15dp"
+					android:padding="20dp"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_weight="1.4"/>
diff --git a/res/layout-land/call_outgoing.xml b/res/layout-land/call_outgoing.xml
index 310a30ecf..96285f7c9 100644
--- a/res/layout-land/call_outgoing.xml
+++ b/res/layout-land/call_outgoing.xml
@@ -35,8 +35,8 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:layout_above="@id/menu"
-		android:layout_below="@id/top_bar"
-		android:paddingTop="10dp">
+		android:paddingTop="10dp"
+		android:layout_below="@+id/top_bar">
 
 		<LinearLayout
 			android:orientation="horizontal"
@@ -122,7 +122,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:padding="12dp"/>
+			android:padding="10dp"/>
 
 		<ImageView
 			android:id="@+id/speaker"
diff --git a/res/layout/call.xml b/res/layout/call.xml
index 4c7fbe505..69cbf91a0 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -200,7 +200,6 @@
 					android:orientation="horizontal">
 
 					<RelativeLayout
-						android:background="@drawable/button_background"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_weight="1">
diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 8f096e709..be2855065 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -913,6 +913,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 						video.setEnabled(true);
 						transfer.setVisibility(View.INVISIBLE);
 						addCall.setVisibility(View.INVISIBLE);
+						conference.setVisibility(View.INVISIBLE);
 						displayVideoCall(false);
 						numpad.setVisibility(View.GONE);
 						options.setImageResource(R.drawable.options_default);
@@ -933,6 +934,7 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 								video.setEnabled(true); // HACK: Used to avoid controls from being hided if video is switched while controls are hiding
 								transfer.setVisibility(View.INVISIBLE);
 								addCall.setVisibility(View.INVISIBLE);
+								conference.setVisibility(View.INVISIBLE);
 								displayVideoCall(false);
 								numpad.setVisibility(View.GONE);
 								options.setImageResource(R.drawable.options_default);