From f6348449fa126dfe65edeb2b97b315ee8d2b3b57 Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Wed, 3 Aug 2011 15:26:53 -0700
Subject: [PATCH] Minor conversation header visual cleanups

- fix header bg on tablets
- fix font color in header
- make subject text wrap on phones

Bug: 5110992
Change-Id: I8c58271788f11251906d71073e6e03033c74f38f
---
 .../header_convo_view_sender_bg_holo.png      | Bin 1245 -> 0 bytes
 .../header_convo_view_sender_bg_holo.png      | Bin 1174 -> 0 bytes
 res/drawable/message_header_bg.xml            |  20 ------------------
 res/layout-sw600dp/message_view_fragment.xml  |   8 +++----
 res/layout/mailbox_list_item.xml              |   4 ++--
 res/layout/message_view_fragment.xml          |  12 +++++------
 res/values/colors.xml                         |   4 ++++
 7 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 res/drawable-hdpi/header_convo_view_sender_bg_holo.png
 delete mode 100644 res/drawable-mdpi/header_convo_view_sender_bg_holo.png
 delete mode 100644 res/drawable/message_header_bg.xml

diff --git a/res/drawable-hdpi/header_convo_view_sender_bg_holo.png b/res/drawable-hdpi/header_convo_view_sender_bg_holo.png
deleted file mode 100644
index 57067637a84c7b1f1aa973f2e6a008e594dc9a97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1245
zcmcIkTWHfz7>+uJh!rm&&Kt+<#RuD*leB3YS7+O_u3+cvDjWLXvgCA&U2<Y_X1l>~
zQ}6~Vh@elR;-mQDlM2&;2!byP6BHD5Y$Aw)h#)9>vaQpHAtD$E|2Ze$_x+di|2fsx
zx-+nJ-BOO@0=X8oz^umJt|j&U$-WJ~X`q=-+D=NeqPdt$8l)S8oTc^P0@jRyLyvG1
z$1N(E#ZKCp-=*lp3TZwjRJ9z&=D4Qjs-x*;OhGs9G3^BZ@$Nkym_~x{h~#13N#kC#
zWzfa#gRMn<u&l=ozIi)nswzyt!c+rQtIzh7YJ#8ERoL1;7I-iXq2&ZW6I5ru4Wx;S
zK_mo&I+P)hQ3y%lXf(PNh!8;miUJaYD5^-J0wI`vc;?MDN=iY^&iZ1z1m8=kqX<H!
zQVCV05OI416pzP!4N(j-M9>?ssa6fzUSmx`#h&h(4mF7ld_}FB^wR{-BArRWa`O2(
zVcVN66f2of)f@qZpkP^kUejog7Vxhy=0$tO0S5~O?2&#~XZKNRtdUvm{_MyHvS^gu
zuE{P%>r;u|Z(*C})CAAIgbdSAU@`^~iiTlSgmMg_SW;HwP|AuCD9SNOu4&B2WypvO
zQxPeXk`T(k7?QJDNmkWlI*p>SY>k_<J*wF{uK6{Y-&t<>k6b0~VvQ2FNJw9;1KN5C
zC0;LaK)O8w@|tei{@%ZynQT?;nuoEGb%_P0>#Laa_)o)ZG8In26cW+=dCzc-f2o<k
zf)V`Y_^nxLN2~+=<y`Bt&D`){n@x<%M&m&lOmf_UKu%2-t1sS<Ukx1FvG(}uiPPG}
zJNB?v7d{p?pC;Q*o*mw@X{>JJwe#VV&tBD4%unAweSg_=`QXq{^TetTn{QtYbOaA<
z8-KeWs?XO1_KarI7s!(pllvE!V7aUQR{j4ohwd*cO$;|Yez-uobY@Wru3z|g-KDV`
wBMpCNeyp5&_jUV}b>#ZF4^Kbu8~w7ni`#pm9xQ)zWyJsC<T9=5%~aRXpGgpx+W-In

diff --git a/res/drawable-mdpi/header_convo_view_sender_bg_holo.png b/res/drawable-mdpi/header_convo_view_sender_bg_holo.png
deleted file mode 100644
index 940960fb04878fd512af0ff611db217af17f16e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1174
zcmbtU&r1|h9G^-`1k)~&9_leBM71+-X55+G!PRzmc5|a$bzRUd<~Z|q9d&*<^R`_j
zP)wpI`U8RpFCj!fs8d8_7fI^SAuubV47wCXhfZC3qpo!j4>d6JzVE&7=kxtNm%B12
zYik;7D2l30btqY~M#+1kdN=tdZa01;O9M{y;T}7WOR9^gsBRA;kTTT*$|6-CA6rDN
z6tydF<oa-5`n0UsCZqZ~Oxbh@nxb0U%Z{pzAPfdk!LTCq_s36ZVCWILH<*TLCys`U
zjtLj_Ok{G}#E2Hw>Gn3zT9yfciLeUF=BVY#<p{mTD-+p2W@)gdf=43sx>J4WE)cg}
z1cD3<Xi$Ve<QPt9ktFFj;2{TD$g><D;3Qe#WeCB>LlbMRo|m&qa>EwcMd%@n9hqfI
zr4myT7~3tdTsR!|Ie0!mGy>kZh1GJv@|r3P3i349aIj%pz-Lqk?IMoQ#MAW<OedY*
zB(}VbM3I!SWz}Ih2C}B<$F-*I;Vk;&#+KS%Zrnj^7I}8j)kr<^O%*W7-S&ojMdFRz
z=^CUc>ZoFCMH5*#r9^0Q!{~-C!)OR{oYVp(9*QB33q?gG422{gguECM#0tk&*jQ8v
z#S%eDNW=(70){v-nG{4tiN@oc6iQaGDa*sErJ;&lgV^1`irZr4xQkS5yE)q)t#m-w
zkd19`$aX-yCkWE2W?25-FVA|k3UZBeNKd-93D)u}8(Y{HrC2o13w)gCxvk?~$Ljx*
zGnP2R`pxlIvs8{q2m0b>>yypq@F0s!j7vr%c1SkJSS_TKXs-PB+w0ldo!#|Sub$Lh
z?04|gY*ouO8a$dg+I6I=8O%4$P0^YD>Xql6^-DXKrD5Sra3%Qe^ZhGl#TRdGu8v*m
z=5g~c>L;_jXU;fy@6(O(sq2gQL-Nax;ob*zR1!|_yE;(Sbl_R_|BDNg7k-@o+O|}f
jY-qo;|6%dg>alt1WpQQZ{occ;{69r1kx}l(2Bv=lMr?EE

diff --git a/res/drawable/message_header_bg.xml b/res/drawable/message_header_bg.xml
deleted file mode 100644
index d3d6ca4a1..000000000
--- a/res/drawable/message_header_bg.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/header_convo_view_sender_bg_holo"
-    android:tileMode="repeat" />
diff --git a/res/layout-sw600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml
index a634c76a0..a25553d29 100644
--- a/res/layout-sw600dp/message_view_fragment.xml
+++ b/res/layout-sw600dp/message_view_fragment.xml
@@ -74,7 +74,7 @@
             android:layout_below="@id/subject_divider"
             android:layout_toRightOf="@id/badge"
             android:layout_alignRight="@id/subject"
-            android:background="@drawable/message_header_bg"
+            android:background="@color/message_view_header_color"
             />
 
         <!--
@@ -160,7 +160,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:textSize="18dip"
-                    android:textColor="@color/text_primary_color"
+                    android:textColor="@color/text_primary_color_inverse"
                     android:textStyle="bold"
                     android:singleLine="true"
                     android:ellipsize="end"
@@ -172,9 +172,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dip"
-                android:layout_marginLeft="40dip"
+                android:layout_marginLeft="34dip"
                 android:textSize="14dip"
-                android:textColor="@color/text_secondary_color"
+                android:textColor="@color/text_secondary_color_inverse"
                 android:singleLine="true"
                 android:ellipsize="end"
                 />
diff --git a/res/layout/mailbox_list_item.xml b/res/layout/mailbox_list_item.xml
index c7304f902..0e32b69cf 100644
--- a/res/layout/mailbox_list_item.xml
+++ b/res/layout/mailbox_list_item.xml
@@ -35,7 +35,7 @@
         android:layout_marginRight="@dimen/mailbox_list_padding_right"
         android:singleLine="true"
         android:textSize="14dip"
-        android:textColor="@color/text_secondary_color"
+        android:textColor="?android:attr/textColorSecondary"
         />
     <RelativeLayout
         android:layout_alignParentLeft="true"
@@ -61,7 +61,7 @@
             android:ellipsize="end"
             android:singleLine="true"
             android:textSize="18dip"
-            android:textColor="@color/text_primary_color"
+            android:textColor="?android:attr/textColorPrimary"
             />
     </RelativeLayout>
     <!-- Color chips are shown only for account rows on combined view. -->
diff --git a/res/layout/message_view_fragment.xml b/res/layout/message_view_fragment.xml
index b99aa572d..cad88cd32 100644
--- a/res/layout/message_view_fragment.xml
+++ b/res/layout/message_view_fragment.xml
@@ -44,19 +44,17 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 >
-                <!-- Subject.  TODO: Move this to the action bar -->
                 <TextView
                     android:id="@+id/subject"
                     android:layout_width="match_parent"
-                    android:layout_height="32dip"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:layout_marginBottom="4dip"
                     android:layout_marginLeft="8dip"
                     android:layout_marginRight="8dip"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="?android:attr/textColorSecondary"
                     android:textStyle="bold"
-                    android:gravity="center_vertical"
-                    android:singleLine="true"
-                    android:ellipsize="end"
                     />
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -92,7 +90,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textSize="16dip"
-                            android:textColor="#ffffff"
+                            android:textColor="@color/text_primary_color_inverse"
                             android:singleLine="true"
                             android:ellipsize="end"
                             />
@@ -102,7 +100,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textSize="14dip"
-                            android:textColor="#eeeeee"
+                            android:textColor="@color/text_secondary_color_inverse"
                             android:singleLine="true"
                             android:ellipsize="end"
                             />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 918037df4..dc155fd14 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -34,6 +34,10 @@
     <color name="text_ternary_color">#aaaaaa</color>
     <color name="text_disabled_color">#888888</color>
 
+    <!-- TODO: properly put these text colors in the theme and use selectors -->
+    <color name="text_primary_color_inverse">#ffffff</color>
+    <color name="text_secondary_color_inverse">#eeeeee</color>
+
     <color name="divider_color">#ff808080</color>
 
     <!-- Account color chips on combined view -->