From 7fe37034470090757ed0b73e90c83cb85d341b3a Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Mon, 3 Aug 2015 15:26:44 +0200
Subject: [PATCH] fix address bar and digit 0+

---
 res/layout/dialer.xml                | 6 ++----
 res/layout/main.xml                  | 4 ++++
 res/layout/numpad.xml                | 2 +-
 src/org/linphone/DialerFragment.java | 1 -
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 20dfeef56..20656388a 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -26,12 +26,10 @@
 			android:id="@+id/Address"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:gravity="center"
 			android:background="@color/colorF"
 			android:ellipsize="start"
-			android:inputType="phone"
-			android:enabled="false"
-			android:paddingLeft="5dp"
+			android:inputType="textEmailAddress"
+			android:paddingLeft="20dp"
 			android:paddingRight="5dp"
 			android:layout_toLeftOf="@id/Erase"
 			android:layout_centerVertical="true"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index ae8791785..e7130edeb 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -54,6 +54,7 @@
 				android:layout_height="wrap_content"
 				android:adjustViewBounds="true"
 				android:layout_margin="10dp"
+				android:scaleType="center"
 				android:contentDescription="@string/content_description_history"
 				android:src="@drawable/footer_history" />
 
@@ -91,6 +92,7 @@
 				android:layout_height="wrap_content"
 				android:adjustViewBounds="true"
 				android:layout_margin="10dp"
+				android:scaleType="center"
 				android:contentDescription="@string/content_description_contacts"
 				android:src="@drawable/footer_contacts" />
 
@@ -119,6 +121,7 @@
 				android:layout_height="wrap_content"
 				android:adjustViewBounds="true"
 				android:layout_margin="10dp"
+				android:scaleType="center"
 				android:contentDescription="@string/content_description_contacts"
 				android:src="@drawable/footer_dialer" />
 
@@ -144,6 +147,7 @@
 				android:layout_height="wrap_content"
 				android:adjustViewBounds="true"
 				android:layout_margin="10dp"
+				android:scaleType="center"
 				android:contentDescription="@string/content_description_contacts"
 				android:src="@drawable/footer_chat" />
 
diff --git a/res/layout/numpad.xml b/res/layout/numpad.xml
index 61ffd39d0..95dd39a67 100644
--- a/res/layout/numpad.xml
+++ b/res/layout/numpad.xml
@@ -249,7 +249,7 @@
 
 			<org.linphone.ui.Digit
 				android:id="@+id/Digit00"
-				android:text="0"
+				android:text="0+"
 				style="@style/DialerDigit"
 				android:background="@android:color/transparent"
 				android:soundEffectsEnabled="true"
diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java
index 838e5f6df..cdcc56568 100644
--- a/src/org/linphone/DialerFragment.java
+++ b/src/org/linphone/DialerFragment.java
@@ -33,7 +33,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 
 /**
  * @author Sylvain Berfini