From 5b5a08e00aa2088e7e5a6cfcf8cfb6f711241106 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 15 Nov 2019 11:01:29 +0100
Subject: [PATCH] Improved incall numpad view space

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

diff --git a/app/src/main/res/layout-land/call.xml b/app/src/main/res/layout-land/call.xml
index b47c08bba..836374fce 100644
--- a/app/src/main/res/layout-land/call.xml
+++ b/app/src/main/res/layout-land/call.xml
@@ -109,6 +109,7 @@
                 android:id="@+id/buttons"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginTop="40dp"
                 android:gravity="bottom">
 
                 <!-- This is a better way of splitting screen 50/50 than using weights -->
@@ -119,28 +120,29 @@
                     android:layout_centerHorizontal="true" />
 
                 <include layout="@layout/call_primary_buttons"
+                    android:id="@+id/call_primary_buttons"
                     android:layout_width="match_parent"
                     android:layout_height="60dp"
                     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" />
 
-            </RelativeLayout>
+                <ViewStub
+                    android:id="@+id/numpad"
+                    android:inflatedId="@+id/numpad"
+                    android:layout="@layout/numpad"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:layout_above="@id/call_primary_buttons"
+                    android:background="@color/toolbar_color" />
 
-            <ViewStub
-                android:id="@+id/numpad"
-                android:inflatedId="@+id/numpad"
-                android:layout="@layout/numpad"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:background="@color/toolbar_color" />
+            </RelativeLayout>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/call.xml b/app/src/main/res/layout/call.xml
index d484a5ae3..32277a192 100644
--- a/app/src/main/res/layout/call.xml
+++ b/app/src/main/res/layout/call.xml
@@ -106,8 +106,10 @@
 
             <RelativeLayout
                 android:id="@+id/buttons"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginTop="40dp"
+                android:gravity="bottom"
                 android:orientation="vertical">
 
                 <include layout="@layout/call_primary_buttons"
@@ -117,22 +119,23 @@
                     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" />
 
-            </RelativeLayout>
+                <ViewStub
+                    android:id="@+id/numpad"
+                    android:inflatedId="@+id/numpad"
+                    android:layout="@layout/numpad"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:layout_above="@id/call_primary_buttons"
+                    android:layout_marginBottom="60dp"
+                    android:background="@color/toolbar_color" />
 
-            <ViewStub
-                android:id="@+id/numpad"
-                android:inflatedId="@+id/numpad"
-                android:layout="@layout/numpad"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:background="@color/toolbar_color" />
+            </RelativeLayout>
 
         </RelativeLayout>