From 8a1bdff4a201f0904bda41b9c6cdd0b2fbf48f45 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Thu, 13 Sep 2012 00:56:24 -0500
Subject: [PATCH] message view header cleanup

---
 res/layout/accounts_item.xml       |  6 +--
 res/layout/message_view_header.xml | 71 ++++++++++++++++--------------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index b5718151011..ddbd54b4b67 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -33,10 +33,10 @@
 
         <ImageButton
             android:id="@+id/folders"
-            android:layout_alignParentTop="true" 
-            android:layout_gravity="top"
+            android:gravity="center_vertical"
             android:focusable="false"
-            android:background="@drawable/ic_show_folders"
+            android:layout_marginRight="3dip"
+            android:background="?attr/iconFolder"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             />
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index c9ef5a600c7..e41e0e8623d 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -129,47 +129,21 @@
                 <!-- Date/Time + Icons -->
                 <LinearLayout
                     android:id="@+id/topright_container"
-                    android:layout_marginTop="2dip"
+                    android:layout_marginTop="6dip"
                     android:layout_marginRight="6dip"
                     android:orientation="vertical"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="6dp"
-                    android:gravity="right">
-
-                    <LinearLayout
-                        android:id="@+id/icons_container"
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical">
-
-                        <View
-                            android:id="@+id/answered"
-                            android:layout_width="22sp"
-                            android:layout_height="22sp"
-                            android:paddingRight="4dip"
-                            android:background="@drawable/ic_email_answered_small"/>
-                        <View
-                            android:id="@+id/forwarded"
-                            android:layout_width="22sp"
-                            android:layout_height="22sp"
-                            android:paddingRight="4dip"
-                            android:background="@drawable/ic_email_forwarded_small"/>
-                        <CheckBox
-                            android:id="@+id/flagged"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:focusable="false"
-                            style="?android:attr/starStyle"/>
-
-                    </LinearLayout>
-
+                    android:layout_gravity="right">
                     <LinearLayout
                         android:id="@+id/date_time_container"
-                        android:orientation="horizontal"
+                        android:orientation="vertical"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="right">
+                        android:layout_marginRight="6dip"
+                        android:paddingRight="5dip"
+                            android:gravity="right"
+                        >
 
                         <TextView
                             android:id="@+id/date"
@@ -178,7 +152,6 @@
                             android:singleLine="true"
                             android:ellipsize="none"
                             android:textSize="10sp"
-                            android:paddingRight="3dip"
                             android:textColor="?android:attr/textColorPrimary"
                             android:textAppearance="?android:attr/textAppearanceSmall"/>
 
@@ -194,6 +167,36 @@
 
                     </LinearLayout>
 
+
+                    <LinearLayout
+                        android:id="@+id/icons_container"
+                        android:orientation="horizontal"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical|right">
+
+                        <View
+                            android:id="@+id/answered"
+                            android:layout_width="22sp"
+                            android:layout_height="22sp"
+                            android:paddingRight="4dip"
+                            android:background="@drawable/ic_email_answered_small"/>
+                        <View
+                            android:id="@+id/forwarded"
+                            android:layout_width="22sp"
+                            android:layout_height="22sp"
+                            android:paddingRight="4dip"
+                            android:background="@drawable/ic_email_forwarded_small"/>
+                        <CheckBox
+                            android:id="@+id/flagged"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:focusable="false"
+                            android:button="@drawable/star"
+                            />
+
+                    </LinearLayout>
+
                 </LinearLayout>
 
             </TableRow>