From 27248c34667add301037e5e7a5e5410090238eea Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 17 Jan 2017 14:17:08 +0100
Subject: [PATCH] Prevent contact name to overlap linphone icon when name is
 too long

---
 res/layout/contact_cell.xml | 54 +++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/res/layout/contact_cell.xml b/res/layout/contact_cell.xml
index ec8e0947b..537707085 100644
--- a/res/layout/contact_cell.xml
+++ b/res/layout/contact_cell.xml
@@ -72,32 +72,6 @@
 			android:paddingLeft="5dp"
 			android:paddingRight="5dp" />
 
-		<RelativeLayout
-		    android:layout_width="match_parent"
-		    android:layout_height="wrap_content"
-		    android:layout_toRightOf="@id/avatar_layout"
-		    android:layout_centerVertical="true"
-			android:layout_toLeftOf="@id/delete"
-		    android:layout_marginLeft="10dp">
-
-			<TextView
-			    android:id="@+id/name"
-			    android:lines="1"
-				style="@style/font6"
-			    android:layout_width="match_parent"
-			    android:layout_height="wrap_content"
-			    android:layout_alignParentTop="true"/>
-
-			<TextView
-			    android:id="@+id/contactOrganization"
-				style="@style/font9"
-				android:singleLine="true"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-			    android:layout_alignParentBottom="true"/>
-
-		</RelativeLayout>
-
 		<ImageView
 		    android:id="@+id/friendStatus"
 		    android:visibility="gone"
@@ -122,6 +96,34 @@
 			android:scaleType="centerInside"
 			android:src="@drawable/linphone_user" />
 
+		<RelativeLayout
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:layout_toRightOf="@id/avatar_layout"
+		    android:layout_centerVertical="true"
+			android:layout_toLeftOf="@id/friendLinphone"
+		    android:layout_marginLeft="10dp">
+
+			<TextView
+			    android:id="@+id/name"
+				style="@style/font6"
+				android:lines="1"
+				android:ellipsize="end"
+				android:singleLine="true"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:layout_alignParentTop="true"/>
+
+			<TextView
+			    android:id="@+id/contactOrganization"
+				style="@style/font9"
+				android:singleLine="true"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+			    android:layout_alignParentBottom="true"/>
+
+		</RelativeLayout>
+
 	</RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file