From 06a01083ddc80a599f08647b14a00cbebdd9bd56 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Tue, 1 Mar 2016 15:44:03 +0100
Subject: [PATCH] Crop display name too long / fix bubble notification in
 landscape

---
 res/layout-land/chatlist_cell.xml         |  5 +----
 res/layout-land/main.xml                  | 22 ++++++++++++++--------
 res/layout-sw533dp-land/chatlist_cell.xml |  5 +----
 res/layout-sw533dp/chatlist_cell.xml      |  4 +---
 res/layout/chatlist_cell.xml              |  4 +---
 res/layout/history_cell.xml               |  5 +----
 res/layout/history_detail.xml             |  3 +--
 7 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/res/layout-land/chatlist_cell.xml b/res/layout-land/chatlist_cell.xml
index 0ffda4749..f8caec810 100644
--- a/res/layout-land/chatlist_cell.xml
+++ b/res/layout-land/chatlist_cell.xml
@@ -74,10 +74,7 @@
 			<TextView
 				android:id="@+id/sipUri"
 				android:lines="1"
-				android:ellipsize="marquee"
-				android:marqueeRepeatLimit="marquee_forever"
-				android:scrollHorizontally="true"
-				android:fadingEdge="horizontal"
+				android:ellipsize="end"
 				android:singleLine="true"
 				style="@style/font6"
 				android:paddingLeft="10dp"
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index e5b70d13f..4091a346d 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -104,11 +104,14 @@
 						android:id="@+id/missed_calls"
 						android:background="@drawable/history_chat_indicator"
 						style="@style/font18"
-						android:layout_width="25dp"
-						android:layout_height="25dp"
-						android:layout_margin="12dp"
+						android:layout_width="20dp"
+						android:layout_height="20dp"
 						android:gravity="center"
-						android:visibility="gone"/>
+						android:visibility="gone"
+						android:layout_marginTop="15dp"
+						android:layout_marginRight="5dp"
+						android:layout_alignParentRight="true"
+						android:layout_alignParentEnd="true"/>
 
 				</RelativeLayout>
 
@@ -184,11 +187,14 @@
 						android:id="@+id/missed_chats"
 						android:background="@drawable/history_chat_indicator"
 						style="@style/font18"
-						android:layout_width="25dp"
-						android:layout_height="25dp"
-						android:layout_margin="12dp"
+						android:layout_width="20dp"
+						android:layout_height="20dp"
 						android:gravity="center"
-						android:visibility="gone" />
+						android:visibility="gone"
+						android:layout_marginTop="15dp"
+						android:layout_marginRight="5dp"
+						android:layout_alignParentRight="true"
+						android:layout_alignParentEnd="true"/>
 
 				</RelativeLayout>
 			</LinearLayout>
diff --git a/res/layout-sw533dp-land/chatlist_cell.xml b/res/layout-sw533dp-land/chatlist_cell.xml
index 0d9ee3e44..a4addf588 100644
--- a/res/layout-sw533dp-land/chatlist_cell.xml
+++ b/res/layout-sw533dp-land/chatlist_cell.xml
@@ -73,10 +73,7 @@
 			<TextView
 				android:id="@+id/sipUri"
 				android:lines="1"
-				android:ellipsize="marquee"
-				android:marqueeRepeatLimit="marquee_forever"
-				android:scrollHorizontally="true"
-				android:fadingEdge="horizontal"
+				android:ellipsize="end"
 				android:singleLine="true"
 				style="@style/font6"
 				android:layout_width="wrap_content"
diff --git a/res/layout-sw533dp/chatlist_cell.xml b/res/layout-sw533dp/chatlist_cell.xml
index 692be473b..1f70c94d5 100644
--- a/res/layout-sw533dp/chatlist_cell.xml
+++ b/res/layout-sw533dp/chatlist_cell.xml
@@ -73,9 +73,7 @@
 			<TextView
 				android:id="@+id/sipUri"
 				android:lines="1"
-				android:ellipsize="marquee"
-				android:marqueeRepeatLimit="marquee_forever"
-				android:scrollHorizontally="true"
+				android:ellipsize="end"
 				android:fadingEdge="horizontal"
 				android:singleLine="true"
 				style="@style/font6"
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index 0d9ee3e44..acf2120eb 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -73,10 +73,8 @@
 			<TextView
 				android:id="@+id/sipUri"
 				android:lines="1"
-				android:ellipsize="marquee"
-				android:marqueeRepeatLimit="marquee_forever"
+				android:ellipsize="end"
 				android:scrollHorizontally="true"
-				android:fadingEdge="horizontal"
 				android:singleLine="true"
 				style="@style/font6"
 				android:layout_width="wrap_content"
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index 026ac64ba..314ecc202 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -98,10 +98,7 @@
 			android:id="@+id/sip_uri"
 			style="@style/font6"
 			android:lines="1"
-			android:ellipsize="marquee"
-			android:marqueeRepeatLimit="marquee_forever"
-			android:scrollHorizontally="true"
-			android:fadingEdge="horizontal"
+			android:ellipsize="end"
 			android:singleLine="true"
 			android:gravity="center_vertical"
 			android:layout_width="wrap_content"
diff --git a/res/layout/history_detail.xml b/res/layout/history_detail.xml
index 2eba11853..fa13308e2 100644
--- a/res/layout/history_detail.xml
+++ b/res/layout/history_detail.xml
@@ -5,7 +5,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-
 	<LinearLayout
 		android:id="@+id/top_bar"
 		android:orientation="horizontal"
@@ -75,7 +74,7 @@
 			<TextView
 				android:id="@+id/contact_name"
 				style="@style/font5"
-				android:singleLine="true"
+				android:gravity="center_horizontal"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>