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

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

diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml
index b812e58d4..1a1085b61 100644
--- a/res/layout-land/call.xml
+++ b/res/layout-land/call.xml
@@ -266,7 +266,7 @@
 							android:id="@+id/video"
 							android:src="@drawable/camera_default"
 							android:background="@drawable/button_background"
-							android:padding="22dp"
+							android:padding="20dp"
 							android:layout_width="match_parent"
 							android:layout_height="match_parent"/>
 
@@ -285,7 +285,7 @@
 						android:id="@+id/micro"
 						android:src="@drawable/micro_default"
 						android:background="@drawable/button_background"
-						android:padding="15dp"
+						android:padding="10dp"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_weight="1" />
@@ -304,7 +304,7 @@
 						android:src="@drawable/routes_default"
 						android:background="@drawable/button_background"
 						android:visibility="gone"
-						android:padding="20dp"
+						android:padding="15dp"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:layout_weight="1" />
@@ -346,7 +346,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"
@@ -356,7 +356,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"
@@ -387,7 +387,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"
@@ -397,7 +397,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"
@@ -428,7 +428,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="1.4"/>
@@ -438,7 +438,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="1.4"/>
diff --git a/res/layout-land/call_incoming.xml b/res/layout-land/call_incoming.xml
index 68b24ec2a..897be09bd 100644
--- a/res/layout-land/call_incoming.xml
+++ b/res/layout-land/call_incoming.xml
@@ -33,9 +33,9 @@
 		android:id="@+id/contact_detail"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:layout_below="@id/top_bar"
 		android:paddingTop="10dp"
-		android:layout_above="@+id/menu">
+		android:layout_above="@+id/menu"
+		android:layout_below="@+id/top_bar">
 
 		<LinearLayout
 			android:orientation="horizontal"
diff --git a/res/layout/call.xml b/res/layout/call.xml
index c186d68b9..4c7fbe505 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -228,7 +228,7 @@
 						android:id="@+id/micro"
 						android:src="@drawable/micro_default"
 						android:background="@drawable/button_background"
-						android:padding="12dp"
+						android:padding="10dp"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_weight="1" />
@@ -247,7 +247,7 @@
 						android:src="@drawable/routes_default"
 						android:background="@drawable/button_background"
 						android:visibility="gone"
-						android:padding="20dp"
+						android:padding="15dp"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
 						android:layout_weight="1" />
diff --git a/res/layout/call_outgoing.xml b/res/layout/call_outgoing.xml
index bdea629bd..ab2d5ee3b 100644
--- a/res/layout/call_outgoing.xml
+++ b/res/layout/call_outgoing.xml
@@ -108,7 +108,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/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 7b837be92..8f096e709 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -1170,9 +1170,9 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
 	private void hideOrDisplayAudioRoutes()
 	{
 		if (routeSpeaker.getVisibility() == View.VISIBLE) {
-			routeSpeaker.setVisibility(View.GONE);
-			routeBluetooth.setVisibility(View.GONE);
-			routeEarpiece.setVisibility(View.GONE);
+			routeSpeaker.setVisibility(View.INVISIBLE);
+			routeBluetooth.setVisibility(View.INVISIBLE);
+			routeEarpiece.setVisibility(View.INVISIBLE);
 		} else {
 			routeSpeaker.setVisibility(View.VISIBLE);
 			routeBluetooth.setVisibility(View.VISIBLE);