From 358a8157015c7cfe9ca219a9f516656f5975666d Mon Sep 17 00:00:00 2001
From: Andy Huang <ath@google.com>
Date: Wed, 2 Nov 2011 15:33:38 -0700
Subject: [PATCH] Style cleanup in email message header to make it more like
 Gmail

Linkify email addresses in expanded message details
Remove divider line in upper header on phone
Embolden sender name
Twiddle expanded details line spacing and padding to match Gmail
Add space char to collapsed details recipient enumerator (comma)

Bug: 5520692
Bug: 5520787
Change-Id: Iad4a265168d111aa01654a33a9a14f7968fc3181
---
 .../com/android/emailcommon/mail/Address.java |  2 +-
 res/layout/message_view_details.xml           | 11 +++++++---
 res/layout/message_view_header_actions.xml    |  7 -------
 res/layout/message_view_subheader.xml         |  2 +-
 res/values/styles.xml                         | 21 +++++++++++--------
 .../emailcommon/mail/AddressUnitTests.java    |  2 +-
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/emailcommon/src/com/android/emailcommon/mail/Address.java b/emailcommon/src/com/android/emailcommon/mail/Address.java
index a135d96b1..a2807c916 100644
--- a/emailcommon/src/com/android/emailcommon/mail/Address.java
+++ b/emailcommon/src/com/android/emailcommon/mail/Address.java
@@ -312,7 +312,7 @@ public class Address {
         }
         StringBuffer sb = new StringBuffer(addresses[0].toFriendly());
         for (int i = 1; i < addresses.length; i++) {
-            sb.append(',');
+            sb.append(", ");
             sb.append(addresses[i].toFriendly());
         }
         return sb.toString();
diff --git a/res/layout/message_view_details.xml b/res/layout/message_view_details.xml
index a7780b60e..ece3c6b4e 100644
--- a/res/layout/message_view_details.xml
+++ b/res/layout/message_view_details.xml
@@ -19,6 +19,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_toLeftOf="@+id/show_details"
+    android:paddingTop="14dp"
+    android:paddingBottom="7dp"
     android:orientation="vertical"
     android:stretchColumns="2"
     android:shrinkColumns="2"
@@ -52,7 +54,8 @@
             />
         <TextView
             android:id="@+id/to"
-            style="@style/message_details_value"
+            android:autoLink="email"
+            style="@style/message_details_value_selectable"
             />
     </TableRow>
     <TableRow
@@ -65,7 +68,8 @@
             />
         <TextView
             android:id="@+id/cc"
-            style="@style/message_details_value"
+            android:autoLink="email"
+            style="@style/message_details_value_selectable"
             />
     </TableRow>
     <TableRow
@@ -78,7 +82,8 @@
             />
         <TextView
             android:id="@+id/bcc"
-            style="@style/message_details_value"
+            android:autoLink="email"
+            style="@style/message_details_value_selectable"
             />
     </TableRow>
 </TableLayout>
diff --git a/res/layout/message_view_header_actions.xml b/res/layout/message_view_header_actions.xml
index 56a732c00..dd55e8122 100644
--- a/res/layout/message_view_header_actions.xml
+++ b/res/layout/message_view_header_actions.xml
@@ -34,13 +34,6 @@
         android:src="@drawable/ic_reply_all_holo_dark"
         android:contentDescription="@string/reply_all_action"
         />
-    <View
-        android:id="@+id/more_separator"
-        android:layout_width="1dip"
-        android:layout_height="24dip"
-        android:layout_margin="3dip"
-        android:background="#ddd"
-        />
     <ImageButton
         android:id="@+id/more"
         style="@android:style/Widget.Holo.ActionButton.Overflow"
diff --git a/res/layout/message_view_subheader.xml b/res/layout/message_view_subheader.xml
index 649ea336a..026c92149 100644
--- a/res/layout/message_view_subheader.xml
+++ b/res/layout/message_view_subheader.xml
@@ -33,7 +33,7 @@
             android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:layout_marginLeft="4dip"
+            android:layout_marginLeft="8dip"
             android:singleLine="true"
             android:ellipsize="end"
             style="@style/message_view_text"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index abd2bbd50..90debd4c9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -81,22 +81,24 @@
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
     </style>
 
-    <style name="message_details_label">
-        <item name="android:textSize">14dip</item>
-        <item name="android:textColor">@color/text_secondary_color</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:padding">8dip</item>
-        <item name="android:singleLine">true</item>
-    </style>
-
     <style name="message_details_value">
         <item name="android:textSize">14dip</item>
         <item name="android:textColor">@color/text_secondary_color</item>
-        <item name="android:padding">8dip</item>
         <item name="android:singleLine">false</item>
+        <item name="android:lineSpacingMultiplier">1.5</item>
+    </style>
+
+    <style name="message_details_value_selectable" parent="message_details_value">
         <item name="android:textIsSelectable">true</item>
     </style>
 
+    <style name="message_details_label" parent="message_details_value">
+        <item name="android:textStyle">bold</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_marginLeft">8dp</item>
+    </style>
+
     <style name="message_view_subject">
         <item name="android:textSize">18dip</item>
         <item name="android:textColor">@color/text_primary_color</item>
@@ -230,6 +232,7 @@
 
     <style name="message_header_sender_name">
         <item name="android:textSize">16dip</item>
+        <item name="android:textStyle">bold</item>
         <item name="android:textColor">@color/text_primary_color_inverse</item>
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">end</item>
diff --git a/tests/src/com/android/emailcommon/mail/AddressUnitTests.java b/tests/src/com/android/emailcommon/mail/AddressUnitTests.java
index f9b8c945c..c132d2b1d 100644
--- a/tests/src/com/android/emailcommon/mail/AddressUnitTests.java
+++ b/tests/src/com/android/emailcommon/mail/AddressUnitTests.java
@@ -548,7 +548,7 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals(null, Address.toFriendly(list1));
         assertEquals(null, Address.toFriendly(list2));
         assertEquals("personal1", Address.toFriendly(list3));
-        assertEquals("personal1,address2,address3", Address.toFriendly(list4));
+        assertEquals("personal1, address2, address3", Address.toFriendly(list4));
     }
 
     /**