From 9d934f7b33bf2d1897b09d72241d96f34e54faf8 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Thu, 13 Sep 2012 16:00:21 +0200
Subject: [PATCH] Fix led misplaced with alt bubbles

---
 res/layout/chat_bubble_alt_outgoing.xml | 1 +
 res/values/non_localizable_custom.xml   | 2 +-
 src/org/linphone/ui/BubbleChat.java     | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/layout/chat_bubble_alt_outgoing.xml b/res/layout/chat_bubble_alt_outgoing.xml
index 44a75fc29..9b8b2fdaa 100644
--- a/res/layout/chat_bubble_alt_outgoing.xml
+++ b/res/layout/chat_bubble_alt_outgoing.xml
@@ -8,6 +8,7 @@
     <ImageView 
 	    android:contentDescription="@string/content_description_message_status"
         android:id="@+id/status"
+        android:layout_gravity="center_vertical"
 	    android:layout_width="wrap_content"
 	    android:layout_height="wrap_content"
 	    android:adjustViewBounds="true" />
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 59aadd0ff..8a40f9c35 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -21,7 +21,7 @@
 	<bool name="lock_statusbar">false</bool>
 	<bool name="emoticons_in_messages">true</bool>
 	<bool name="only_display_username_if_unknown">true</bool>
-	<bool name="display_messages_time">true</bool> <!-- Used to show the time of each message arrival -->
+	<bool name="display_messages_time_and_status">true</bool> <!-- Used to show the time of each message arrival -->
 	<bool name="display_time_aside">false</bool> <!-- if display_messages_time = true, display time on the side of the message instead of below -->
 	
 	<bool name="call_last_log_if_adress_is_empty">true</bool>
diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java
index e2bf3cf7b..70883c7e0 100644
--- a/src/org/linphone/ui/BubbleChat.java
+++ b/src/org/linphone/ui/BubbleChat.java
@@ -65,7 +65,7 @@ public class BubbleChat {
 	    emoticons.put(":-*", R.drawable.emo_im_kissing);
 	    emoticons.put(":*", R.drawable.emo_im_kissing);
 	    emoticons.put(":-/", R.drawable.emo_im_undecided);
-	    emoticons.put(":/ ", R.drawable.emo_im_undecided);
+	    emoticons.put(":/ ", R.drawable.emo_im_undecided); // The space after is needed to avoid bad display of links
 	    emoticons.put(":-\\", R.drawable.emo_im_undecided);
 	    emoticons.put(":\\", R.drawable.emo_im_undecided);
 	    emoticons.put(":-O", R.drawable.emo_im_surprised);
@@ -110,7 +110,7 @@ public class BubbleChat {
     		text = getTextWithHttpLinks(message);
     	}
     	
-    	if (context.getResources().getBoolean(R.bool.display_messages_time)) {
+    	if (context.getResources().getBoolean(R.bool.display_messages_time_and_status)) {
     		LinearLayout layout;
 	    	if (context.getResources().getBoolean(R.bool.display_time_aside)) {
 		    	if (isIncoming) {