From f4bad99765c842574cda53f9533e62619507289e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 24 Oct 2018 15:55:56 +0200
Subject: [PATCH] Moved back to call button to the left for basic chat rooms

---
 res/layout/chat.xml                           | 20 +++++++++----------
 .../org/linphone/chat/GroupChatFragment.java  |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 6c97e62a6..0b9656ecb 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -53,16 +53,6 @@
 
             </LinearLayout>
 
-            <ImageView
-                android:id="@+id/start_call"
-                android:src="@drawable/call_alt_start"
-                android:background="@drawable/toolbar_button"
-                android:contentDescription="@string/content_description_call"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2"
-                android:padding="15dp"/>
-
 			<ImageView
 				android:id="@+id/back_to_call"
 				android:src="@drawable/call_back"
@@ -74,6 +64,16 @@
 				android:visibility="gone"
 				android:padding="15dp"/>
 
+            <ImageView
+                android:id="@+id/start_call"
+                android:src="@drawable/call_alt_start"
+                android:background="@drawable/toolbar_button"
+                android:contentDescription="@string/content_description_call"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:padding="15dp"/>
+
             <ImageView
                 android:id="@+id/group_infos"
                 android:src="@drawable/chat_room_group_infos"
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 449469b9f..cab8fb75c 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -594,7 +594,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
         Core core = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
         if (core == null || mChatRoom == null) return;
 
-        mBackToCallButton.setVisibility(View.GONE);
         if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
             mCallButton.setVisibility(View.VISIBLE);
             mGroupInfosButton.setVisibility(View.GONE);
@@ -614,9 +613,9 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
             mParticipantsLabel.setVisibility(View.VISIBLE);
         }
 
+        mBackToCallButton.setVisibility(View.GONE);
         if (core.getCallsNb() > 0) {
             mBackToCallButton.setVisibility(View.VISIBLE);
-            mCallButton.setVisibility(View.GONE);
         }
 
         if (mChatRoom.hasBeenLeft()) {