From f8892448ad8f5c10510a958b9e46473a68727900 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 30 Sep 2011 11:39:04 +0200
Subject: [PATCH] Better conference callee appearance.

---
 res/layout/conf_callee.xml               |  2 +-
 res/values/callee_style.xml              |  6 ++++--
 src/org/linphone/ConferenceActivity.java | 17 +++++++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml
index eb117bc4b..74d923c93 100644
--- a/res/layout/conf_callee.xml
+++ b/res/layout/conf_callee.xml
@@ -30,7 +30,7 @@
 	<LinearLayout android:id="@+id/callee_statuses" android:layout_toLeftOf="@id/callee_buttons"
 	  android:layout_width="wrap_content" android:layout_height="fill_parent"
 	  android:layout_centerVertical="true">
-	  	<TextView android:id="@+id/status_label" style="@style/callee_status"/>
+	  	<TextView android:id="@+id/status_label" style="@style/callee_status" />
 	  	<ImageView android:id="@+id/callee_status_paused" style="@style/callee_status" android:src="@drawable/conf_status_paused" />
 		<ImageView android:id="@+id/callee_status_inconf" style="@style/callee_status" android:src="@drawable/conf_status_inconf"/>
 	</LinearLayout>
diff --git a/res/values/callee_style.xml b/res/values/callee_style.xml
index 6231cfc25..5a82de385 100644
--- a/res/values/callee_style.xml
+++ b/res/values/callee_style.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="callee_name" parent="@android:style/TextAppearance.Medium">
+    <style name="callee_name" parent="@android:style/TextAppearance.Large">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
+        <item name="android:gravity">fill_vertical</item>
     </style>
 
-    <style name="callee_address" parent="@android:style/TextAppearance">
+    <style name="callee_address" parent="@android:style/TextAppearance.Medium">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
+        <item name="android:gravity">fill_vertical</item>
     </style>
 
 	<style name="callee_status">
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 7ee40cef1..515ebb4e7 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -44,6 +44,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -418,10 +419,18 @@ public class ConferenceActivity extends ListActivity implements
 			final LinphoneCall call = linphoneCalls.get(position);
 			final LinphoneCall.State state = call.getState();
 
-			((TextView) v.findViewById(R.id.name)).setText(call
-					.getRemoteAddress().getDisplayName());
-			((TextView) v.findViewById(R.id.address)).setText(call
-					.getRemoteAddress().getUserName());
+			String mainText = call.getRemoteAddress().getDisplayName();
+			String complText = call.getRemoteAddress().getUserName();
+			TextView mainTextView = (TextView) v.findViewById(R.id.name);
+			TextView complTextView = (TextView) v.findViewById(R.id.address);
+			if (TextUtils.isEmpty(mainText)) {
+				mainTextView.setText(complText);
+				complTextView.setVisibility(View.GONE);
+			} else {
+				mainTextView.setText(mainText);
+				complTextView.setText(complText);
+				complTextView.setVisibility(View.VISIBLE);
+			}
 
 			final boolean isInConference = call.isInConference();
 			boolean currentlyActiveCall = !isInConference