From 66f349ebd214a8c7b7497396360d919af911f671 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 20 Nov 2019 10:12:40 +0100
Subject: [PATCH] Updated call layout to allow for secondary buttons to be
 visible above numpad

---
 app/src/main/res/layout-land/call.xml | 12 ++++++------
 app/src/main/res/layout/call.xml      | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml
index 836374fce..e164b73f8 100644
--- a/app/src/main/res/layout-land/call.xml
+++ b/app/src/main/res/layout-land/call.xml
@@ -126,12 +126,6 @@
                     android:layout_alignParentBottom="true"
                     android:layout_toLeftOf="@id/vertical_divider" />
 
-                <include layout="@layout/call_secondary_buttons"
-                    android:id="@+id/call_secondary_buttons"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_toRightOf="@id/vertical_divider" />
-
                 <ViewStub
                     android:id="@+id/numpad"
                     android:inflatedId="@+id/numpad"
@@ -142,6 +136,12 @@
                     android:layout_above="@id/call_primary_buttons"
                     android:background="@color/toolbar_color" />
 
+                <include layout="@layout/call_secondary_buttons"
+                    android:id="@+id/call_secondary_buttons"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_toRightOf="@id/vertical_divider" />
+
             </RelativeLayout>
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml
index 32277a192..dd38eaaa9 100644
--- a/app/src/main/res/layout/call.xml
+++ b/app/src/main/res/layout/call.xml
@@ -118,12 +118,6 @@
                     android:layout_height="60dp"
                     android:layout_alignParentBottom="true" />
 
-                <include layout="@layout/call_secondary_buttons"
-                    android:id="@+id/call_secondary_buttons"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_above="@id/call_primary_buttons" />
-
                 <ViewStub
                     android:id="@+id/numpad"
                     android:inflatedId="@+id/numpad"
@@ -135,6 +129,12 @@
                     android:layout_marginBottom="60dp"
                     android:background="@color/toolbar_color" />
 
+                <include layout="@layout/call_secondary_buttons"
+                    android:id="@+id/call_secondary_buttons"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_above="@id/call_primary_buttons" />
+
             </RelativeLayout>
 
         </RelativeLayout>