From 3eeaf74d5a5fb0a6024d55d6aaa848b98d7473b8 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Tue, 4 Oct 2011 12:36:11 +0200
Subject: [PATCH] Fix callee box text alignment and reduce contact's picture
 size

---
 res/layout/conf_callee.xml  | 9 ++++-----
 res/layout/conferencing.xml | 2 +-
 res/layout/incoming.xml     | 2 +-
 res/values/callee_style.xml | 2 ++
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml
index 74d923c93..7d3995cc5 100644
--- a/res/layout/conf_callee.xml
+++ b/res/layout/conf_callee.xml
@@ -36,13 +36,12 @@
 	</LinearLayout>
 
 
-    <LinearLayout android:id="@+id/callee_block" 
+    <LinearLayout android:id="@+id/callee_block" android:orientation="vertical"
     	android:layout_toRightOf="@id/picture" android:layout_toLeftOf="@id/callee_statuses"
-    	android:layout_width="fill_parent" android:layout_height="fill_parent"
-    	android:layout_centerVertical="true" android:orientation="vertical">
+    	android:layout_width="fill_parent" android:layout_height="fill_parent" 
+    	android:layout_alignParentTop="true" android:layout_alignParentBottom="true">
       <TextView android:id="@+id/name" style="@style/callee_name" />
-      <TextView android:id="@+id/address" style="@style/callee_address" android:singleLine="true"
-		android:ellipsize="marquee"/>
+      <TextView android:id="@+id/address" style="@style/callee_address" />
     </LinearLayout>
 
 
diff --git a/res/layout/conferencing.xml b/res/layout/conferencing.xml
index 42781aeb8..13f9c62ab 100644
--- a/res/layout/conferencing.xml
+++ b/res/layout/conferencing.xml
@@ -60,7 +60,7 @@
 		<ImageView android:id="@+id/incall_picture" android:visibility="gone"
 			android:layout_height="wrap_content" android:layout_width="wrap_content" 
 			android:layout_gravity="center" android:scaleType="fitCenter"
-			android:padding="10sp" android:minWidth="288px" android:minHeight="288px"
+			android:padding="10sp" android:minWidth="192px" android:minHeight="192px"
 			android:paddingBottom="50sp" />
 	</FrameLayout>
 
diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index aab32ea21..1f3d8277f 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -16,7 +16,7 @@
 		<ImageView android:id="@+id/incoming_picture"
 			android:layout_height="wrap_content" android:layout_width="wrap_content" 
 			android:layout_gravity="center" android:scaleType="fitCenter"
-			android:minWidth="288px" android:minHeight="288px"
+			android:minWidth="192px" android:minHeight="192px"
 			android:paddingBottom="10sp"/>
 		<TextView android:id="@+id/incoming_caller_name"
 			android:layout_width="wrap_content" android:layout_height="wrap_content"
diff --git a/res/values/callee_style.xml b/res/values/callee_style.xml
index 5a82de385..5d659aea5 100644
--- a/res/values/callee_style.xml
+++ b/res/values/callee_style.xml
@@ -12,6 +12,8 @@
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1</item>
         <item name="android:gravity">fill_vertical</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">marquee</item>
     </style>
 
 	<style name="callee_status">