From 4a360a6513f038856e44111738ea42bbd9857083 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 15 Jul 2014 17:10:20 +0200
Subject: [PATCH] Improved dialer layout

---
 res/layout/dialer.xml | 48 ++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 7578d8447..9357733ea 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -1,59 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-  	android:background="@drawable/background"
-    android:orientation="vertical">
+  	android:background="@drawable/background">
     
     <org.linphone.ui.AddressText
         android:id="@+id/Adress"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="0.4"
+        android:layout_height="wrap_content"
         android:textColor="@android:color/white"
         android:background="@drawable/dialer_address_background"
         android:inputType="textEmailAddress"
         android:hint="@string/addressHint"
         android:paddingLeft="20dp"
         android:paddingRight="20dp"
-       	android:layout_gravity="center" />
-	
-    <org.linphone.ui.Numpad 
-	    android:id="@+id/Dialer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="0.15" />
+       	android:layout_gravity="center" 
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"/>
     
     <LinearLayout
+        android:id="@+id/controls"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="0.4" >
+        android:layout_height="wrap_content">
         
         <ImageView
             android:contentDescription="@string/content_description_add_contact"
             android:id="@+id/addContact"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
             android:scaleType="fitXY"
+            android:layout_weight="1"
             android:src="@drawable/add_contact" />
         
         <org.linphone.ui.CallButton
             android:id="@+id/Call"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
             android:scaleType="fitXY"
+            android:layout_weight="1"
             android:src="@drawable/call" />
         
         <org.linphone.ui.EraseButton
             android:id="@+id/Erase"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
             android:scaleType="fitXY"
+            android:layout_weight="1"
             android:src="@drawable/backspace" />
         
     </LinearLayout>
 	
-</LinearLayout>
+    <org.linphone.ui.Numpad 
+	    android:id="@+id/Dialer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/controls"
+        android:layout_below="@id/Adress" />
+	
+</RelativeLayout>