From 2e34cf941d6fddcfb6b9d7e171de44d558353af8 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Thu, 11 Feb 2016 16:45:34 +0100
Subject: [PATCH] fix contact edit row ui

---
 res/layout/contact_edit.xml                 |  6 ++++--
 res/layout/contact_edit_row.xml             | 19 ++++++++++---------
 src/org/linphone/ContactEditorFragment.java |  4 ++++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/res/layout/contact_edit.xml b/res/layout/contact_edit.xml
index 690d58dee..4239079b3 100644
--- a/res/layout/contact_edit.xml
+++ b/res/layout/contact_edit.xml
@@ -151,8 +151,9 @@
 						android:text="@string/sip_address"
 						style="@style/font13"
 						android:textAllCaps="true"
+						android:layout_centerVertical="true"
 						android:layout_width="wrap_content"
-						android:layout_height="match_parent"/>
+						android:layout_height="wrap_content"/>
 
 					<ImageView
 						android:id="@+id/add_address_field"
@@ -190,8 +191,9 @@
 						android:text="@string/phone_number"
 						style="@style/font13"
 						android:textAllCaps="true"
+						android:layout_centerVertical="true"
 						android:layout_width="wrap_content"
-						android:layout_height="match_parent"/>
+						android:layout_height="wrap_content"/>
 
 					<ImageView
 						android:id="@+id/add_number_field"
diff --git a/res/layout/contact_edit_row.xml b/res/layout/contact_edit_row.xml
index 1e3b87957..6dc03cd3d 100644
--- a/res/layout/contact_edit_row.xml
+++ b/res/layout/contact_edit_row.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-	<LinearLayout
+	<RelativeLayout
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="40dp"
 		android:orientation="horizontal"
 		android:paddingBottom="5dp">
 
@@ -14,17 +14,18 @@
 			style="@style/font6"
 			android:textCursorDrawable="@null"
 			android:inputType="textEmailAddress"
-			android:layout_weight="0.09"/>
+			android:layout_toLeftOf="@+id/delete"
+			android:layout_toStartOf="@+id/delete"/>
 
 		<ImageView
 			android:id="@+id/delete"
 			android:src="@drawable/delete_field_default"
 			android:contentDescription="@string/content_description_add"
-			android:layout_alignParentRight="true"
-			android:layout_width="match_parent"
-			android:layout_height="40dp"
-			android:layout_weight="0.91"
 			android:layout_gravity="center"
-			android:paddingLeft="5dp"/>
+			android:layout_width="30dp"
+			android:layout_height="30dp"
+			android:paddingLeft="5dp"
+			android:layout_centerInParent="true"
+			android:layout_alignParentRight="true"/>
 
-	</LinearLayout>
+	</RelativeLayout>
diff --git a/src/org/linphone/ContactEditorFragment.java b/src/org/linphone/ContactEditorFragment.java
index ea1301f12..28f733f71 100644
--- a/src/org/linphone/ContactEditorFragment.java
+++ b/src/org/linphone/ContactEditorFragment.java
@@ -58,6 +58,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -275,6 +276,9 @@ public class ContactEditorFragment extends Fragment {
 		if(LinphoneActivity.isInstanciated()){
 			LinphoneActivity.instance().hideTabBar(false);
 		}
+
+		// Force hide keyboard
+		getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
 	}
 
 	private void pickImage() {