From a4bc4d39105a5edf17206198ad26a7760357799d Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 5 Sep 2018 14:24:26 +0200
Subject: [PATCH] Update call view

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

diff --git a/res/layout/call.xml b/res/layout/call.xml
index 928d4d840..9b4ea32a6 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -82,9 +82,10 @@
 						android:id="@+id/avatar_layout"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/action_menu"
+						android:layout_above="@+id/active_call_info"
 						android:layout_margin="5dp"
 						android:gravity="center_horizontal"
+						android:paddingBottom="10dp"
 						android:paddingTop="10dp">
 
 						<ImageView
@@ -154,8 +155,8 @@
 						android:id="@+id/active_call_info"
 						android:layout_width="match_parent"
 						android:layout_height="80dp"
+						android:layout_above="@+id/help_space"
 						android:layout_alignParentBottom="true"
-						android:layout_below="@+id/avatar_layout"
 						android:layout_marginTop="5dp"
 						android:alpha="0.8"
 						android:background="@color/colorH"
@@ -178,6 +179,7 @@
 							android:layout_gravity="center"
 							/>
 					</LinearLayout>
+
 				</RelativeLayout>
 
 				<LinearLayout
diff --git a/src/android/org/linphone/call/CallActivity.java b/src/android/org/linphone/call/CallActivity.java
index dc364294e..eb77b643b 100644
--- a/src/android/org/linphone/call/CallActivity.java
+++ b/src/android/org/linphone/call/CallActivity.java
@@ -893,7 +893,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 	private void displayCallPaused(boolean display){
 		if(display){
 			mCallPaused.setVisibility(View.VISIBLE);
-			avatar_layout.setVisibility(View.GONE);
+			avatar_layout.setVisibility(View.INVISIBLE);
 			action_bar.setVisibility(View.GONE);
 		} else {
 			mCallPaused.setVisibility(View.GONE);
@@ -1007,7 +1007,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 			mControlsLayout.setVisibility(View.VISIBLE);
 			mActiveCallHeader.setVisibility(View.VISIBLE);
 			callInfo.setVisibility(View.VISIBLE);
-			avatar_layout.setVisibility(View.GONE);
+			avatar_layout.setVisibility(View.INVISIBLE);
 			callsList.setVisibility(View.VISIBLE);
 			if (cameraNumber > 1) {
 				switchCamera.setVisibility(View.VISIBLE);