Correctly handle long names and phone numbers.

This commit forces the lines in the call log and call details to be
formatted on a single line and not to go over the element next to them.

Change-Id: Ief0db69f240b08a99ff400a952d6d7d8c5678216
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index eca4835..e797f0d 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -62,14 +62,6 @@
         android:layout_alignBottom="@id/contact_background"
         android:paddingLeft="5dip"
     >
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentBottom="true"
-        >
-            <include layout="@layout/call_log_phone_call_details" />
-        </RelativeLayout>
         <ImageView
             android:id="@+id/main_action"
             android:layout_width="?attr/call_detail_action_icon_size"
@@ -79,6 +71,15 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentBottom="true"
         />
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@id/main_action"
+            android:layout_alignParentBottom="true"
+        >
+            <include layout="@layout/call_log_phone_call_details" />
+        </RelativeLayout>
     </RelativeLayout>
     <ListView
         android:id="@android:id/list"
diff --git a/res/layout/call_log_list_item_layout.xml b/res/layout/call_log_list_item_layout.xml
index 8ea2bf7..e418882 100644
--- a/res/layout/call_log_list_item_layout.xml
+++ b/res/layout/call_log_list_item_layout.xml
@@ -19,6 +19,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/contact_photo"
+        android:layout_toLeftOf="@id/divider"
         android:layout_alignParentTop="true"
     >
         <include layout="@layout/call_log_phone_call_details"/>
diff --git a/res/layout/call_log_phone_call_details.xml b/res/layout/call_log_phone_call_details.xml
index b46a8ed..1948620 100644
--- a/res/layout/call_log_phone_call_details.xml
+++ b/res/layout/call_log_phone_call_details.xml
@@ -36,6 +36,7 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?attr/call_log_primary_text_color"
             android:layout_marginRight="?attr/call_log_date_margin"
+            android:singleLine="true"
         />
         <TextView
             android:id="@+id/call_type_separator"
@@ -45,6 +46,7 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?attr/call_log_primary_text_color"
             android:text="@string/call_log_type_date_separator"
+            android:singleLine="true"
         />
         <TextView
             android:id="@+id/date"
@@ -54,6 +56,7 @@
             android:textColor="?attr/call_log_primary_text_color"
             android:layout_toRightOf="@id/call_type"
             android:layout_alignParentBottom="true"
+            android:singleLine="true"
         />
     </LinearLayout>
     <TextView
@@ -64,6 +67,7 @@
         android:textColor="?attr/call_log_primary_text_color"
         android:layout_alignParentLeft="true"
         android:layout_above="@id/call_type"
+        android:singleLine="true"
     />
     <TextView
         android:id="@+id/name"
@@ -74,5 +78,6 @@
         android:layout_alignParentLeft="true"
         android:layout_above="@id/number"
         android:paddingBottom="2dp"
+        android:singleLine="true"
     />
 </merge>