From 136dedbbd9de9445292b21ef11a4b8e1fbbe1c38 Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Tue, 9 Aug 2011 16:11:20 -0700
Subject: [PATCH] Update headers in message view.

- this uses the new gradient/drop shadows
- adds quick contact badge triangle thing
- also puts in contentDescriptions for the reply/all/forward/star
  actions that were lost
- also merges the headers in tablet and phone

Bug: 5144711
Change-Id: Ie2d14c26b7818aa4389731794a15be6c31f4981d
---
 .../message_header_bg_holo.9.png              | Bin 0 -> 467 bytes
 .../message_header_bg_holo.9.png              | Bin 0 -> 399 bytes
 .../message_header_bg_holo.9.png              | Bin 0 -> 629 bytes
 .../message_view_header_actions.xml           |  34 ++---
 res/layout-sw600dp/message_view_fragment.xml  | 143 ++----------------
 .../message_view_header_actions.xml           |  47 ++++++
 res/layout/message_view_fragment.xml          | 118 ++++-----------
 res/layout/message_view_header_actions.xml    |  19 +--
 res/layout/message_view_header_upper.xml      |  75 +++++++++
 res/values-land/styles.xml                    |   8 +
 res/values-sw600dp/dimensions.xml             |   6 +
 res/values-sw600dp/styles.xml                 |  17 +++
 res/values/dimensions.xml                     |   7 +
 res/values/strings.xml                        |   5 +-
 res/values/styles.xml                         |  22 +++
 15 files changed, 253 insertions(+), 248 deletions(-)
 create mode 100644 res/drawable-hdpi/message_header_bg_holo.9.png
 create mode 100644 res/drawable-mdpi/message_header_bg_holo.9.png
 create mode 100644 res/drawable-xhdpi/message_header_bg_holo.9.png
 create mode 100644 res/layout-sw600dp/message_view_header_actions.xml
 create mode 100644 res/layout/message_view_header_upper.xml

diff --git a/res/drawable-hdpi/message_header_bg_holo.9.png b/res/drawable-hdpi/message_header_bg_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3914056fe9f98cc5f430f60d30035c92298ff296
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00009a7bBm000Y#
z000Y#0XNCZtpET4g-Jv~R9J=Wm`zT@KnzCT{6uX*T!Oo>;zo!iJ1)RQSaBCtY$_x+
z2+=f|m_<FwGz~}*Nt#7I$+GH<>L-tt$VNmMK$6)1|4ana5jQPAwxs1xk{dOfm|;A?
zSm7$My6V0K<^X^5{CY1TSdq#gG7gwAVvH5zT=jB${Q#6eh;R`sR>}h_x4yU=1?G1>
zs_(3r1u|gsz6%p`vEgu)K@F=9jw&`amFDy`eO-e=(_`86Tx6QN?&mg`)dN$@kyHzg
z!J?*mfBl)W3v3oz!1`(d>#GH<uNJVrTEO~h0qd&;tgmJbHpuimv}Ri|-xVxAwo`MQ
z$kPlVQE~>blXkMLhjHkfT7hPF0UTeY=z(IteS4~kd?lguRKdx>`wL@?U|lfImo{7F
zKtZ#&IGjm*2CRWg;7a{k<3o>hqA)w)3;0yO)3~G+t2FqnzxQ-Z$OD1}&6jJ=LK%SO
zDr0|@31m()A&;Th&!s|@Bz-p9#oc^Yog#uUCk*HKOw|w~!Vh4Pg){KSW<~%2002ov
JPDHLkV1o5K%VYom

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/message_header_bg_holo.9.png b/res/drawable-mdpi/message_header_bg_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..bca045c27b25cecf7ccc36ab6f89103d6a09ac03
GIT binary patch
literal 399
zcmV;A0dW3_P)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00009a7bBm000Y#
z000Y#0XNCZtpET4K}keGR7i>Kmd#4TKoo_)nIt6@3Q`v?bm41s;oj$P=>xg+Ib6Bz
zYbdm!T_h=n#x|L`E)r`Jf13`1kOP;@K<0eh$&fjS2s=uu`uzeCRBf(WwU4A#TSEnS
zlk3~F;qmFj7KKJ^H<;3*ecxtJv+4Be;vO)7_%%?#XnZcCqZ=3Puv%RLbHD<&4jLqJ
z93G5M_QaH0#c>D>fDM4Ifjqm;22LnI<>gi0TTnT+Mt{1h6Upehf5Uj^gZ_=$UhX>h
zK|QDk^`L(Sa{1@^Qht46vlNpqofz9J{Qy$cQ}Spb>&FKtpgdYMvc+3R0vMAfvtk+D
ziOB;*x_v*Ttnz}~q{)ox8i)7Hpn(t=0f)el*0%1T0?2>_cm`eo+XyE>KzaRobU%@n
tvXc#vS7Z6RxFsSerP?pKl7ccoz5-@wdyN5wQvLt{002ovPDHLkV1oYNtVI9-

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/message_header_bg_holo.9.png b/res/drawable-xhdpi/message_header_bg_holo.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc9ed31fb49313356c713e5a71109c913adcd84b
GIT binary patch
literal 629
zcmV-*0*d{KP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000Y#
z000Y#0XNCZtpET5CrLy>RA_<inr&{>Fc5|x=cDE07Muo&Yax!%%TyeIgMdIQkdSCu
zlGwwKW}1l;SIdvh4pkn>a=dm{^LjjSlrbX0nUJiU4G|#}`a)KFK(cy9ZfJO-tc^c6
z)_4KZ*iKnLjk!q;u7G;1ZP77XVg(2gS&9%?3Q-aD+mB!GHZk=dh{yX6x9{G(*Cs}c
z3Q=#=W4YSa#M4N9*8uI<oIOa^JkkQ!hhyB*#*^rO9d(j*xh2NsZr8pFX>jThiM@J6
zWB4&<D>Kf<NQ*-x4!UAg$Rle)RE$4jvQJdIEzDJ!-&_h2NjlMsZ6NnZz5)6|q_k15
zdc-m1SGNC5NSR%TH+CW3*oAmw7vhawh&Og2-q?kBV;AC$U5Gb!A>ODsb2e!!o|Q+Q
z1x=}=|M6{0J5FNw`MucJFnzq9;Z#U5o~;0zuS@I0FH8tFpEyf<=bq3`f9WcKP!%WI
z#)uAzz|bAO+(_SDNgNtUu_nb@9=?WeL?Bcl5vmyKCWfZ%yTj*Cz`!I%rqNTaDYt9j
zCGZ+}1-#%POVm=xO`HiCjUIqMz!A6u?t$MxH<pCS>cZrWo+&Go#=)!Ut__IBCKc0}
z-yzHDs*4iS4Cst>tRx>dLYI(wM!hhQ1$*uhixslS*=>XkZuP=ou2+TVjnVu;p0m5u
zSrmJO!#-6P!JfBEhiNW-sK#E;Hpiz7^Oz7V?(9KC2w~M`udnwDV?~6&#JSHX+MIM)
P00000NkvXXu0mjfiwGWu

literal 0
HcmV?d00001

diff --git a/res/layout-land/message_view_header_actions.xml b/res/layout-land/message_view_header_actions.xml
index df098f819..20e1aa2fa 100644
--- a/res/layout-land/message_view_header_actions.xml
+++ b/res/layout-land/message_view_header_actions.xml
@@ -15,35 +15,31 @@
 -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView
+    <ImageButton
         android:id="@+id/favorite"
+        style="@style/message_view_action_buttons"
         android:src="@drawable/btn_star_off_normal_holo_light"
-        android:layout_width="32dip"
-        android:layout_height="24dip"
-        android:layout_margin="8dip"
+        android:contentDescription="@string/favorite_action"
         />
-    <ImageView
+    <ImageButton
         android:id="@+id/reply"
+        style="@style/message_view_action_buttons"
         android:src="@drawable/ic_reply_holo_dark"
-        android:layout_width="32dip"
-        android:layout_height="24dip"
-        android:layout_margin="8dip"
-        android:baselineAlignBottom="true"
+        android:contentDescription="@string/reply_action"
         />
-    <ImageView
+    <ImageButton
         android:id="@+id/reply_all"
+        style="@style/message_view_action_buttons"
         android:src="@drawable/ic_reply_all_holo_dark"
-        android:layout_width="32dip"
-        android:layout_height="24dip"
-        android:layout_margin="8dip"
-        android:baselineAlignBottom="true"
+        android:contentDescription="@string/reply_all_action"
         />
-    <ImageView
+
+    <!-- Add extra margin on the right for the last action on landscape -->
+    <ImageButton
         android:id="@+id/forward"
+        style="@style/message_view_action_buttons"
         android:src="@drawable/ic_forward_holo_dark"
-        android:layout_width="32dip"
-        android:layout_height="24dip"
-        android:layout_margin="8dip"
-        android:baselineAlignBottom="true"
+        android:contentDescription="@string/forward_action"
+        android:layout_marginRight="24dip"
         />
 </merge>
diff --git a/res/layout-sw600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml
index a25553d29..790ecaab5 100644
--- a/res/layout-sw600dp/message_view_fragment.xml
+++ b/res/layout-sw600dp/message_view_fragment.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ffffffff"
+    android:background="@android:color/white"
     >
     <ProgressBar
         android:id="@+id/loading_progress"
@@ -56,129 +56,18 @@
             style="@style/message_view_horizontal_divider"
             />
 
-        <!-- Badge -->
-        <ImageButton
-            android:id="@+id/badge"
-            android:layout_width="64dip"
-            android:layout_height="64dip"
-            android:layout_below="@id/subject_divider"
-            android:layout_alignLeft="@id/subject"
-            android:padding="0dip"
-            android:scaleType="fitCenter"
-            />
-        <!-- Background for sender name and buttons -->
-        <View
-            android:id="@+id/header_background"
-            android:layout_width="0dip"
-            android:layout_height="64dip"
-            android:layout_below="@id/subject_divider"
-            android:layout_toRightOf="@id/badge"
-            android:layout_alignRight="@id/subject"
-            android:background="@color/message_view_header_color"
-            />
-
-        <!--
-            reply, reply-all, forward, Star
-            These buttons can all be gone at runtime, so don't refer to individual buttons from
-            other views.  Instead refer to this outer layout.
-        -->
-        <LinearLayout
-            android:id="@+id/forward_reply_buttons"
-            android:layout_width="wrap_content"
+        <!-- Upper header. Outer container needed only since the relative layout
+             params can't be passed in an include tag.-->
+        <FrameLayout
+            android:id="@+id/message_view_header_upper"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dip"
-            android:layout_marginLeft="0dip"
-            android:layout_alignTop="@id/header_background"
-            android:layout_alignRight="@id/header_background"
-            android:orientation="horizontal"
+            android:layout_marginLeft="32dip"
+            android:layout_marginRight="32dip"
+            android:layout_below="@id/subject_divider"
             >
-            <ImageButton
-                android:id="@+id/reply"
-                android:layout_marginRight="16dip"
-                android:contentDescription="@string/reply_action"
-                android:src="@drawable/ic_reply_holo_dark"
-                android:visibility="gone"
-                style="@style/message_view_action_buttons"
-                />
-            <ImageButton
-                android:id="@+id/reply_all"
-                android:layout_marginRight="16dip"
-                android:contentDescription="@string/reply_all_action"
-                android:src="@drawable/ic_reply_all_holo_dark"
-                android:visibility="gone"
-                style="@style/message_view_action_buttons"
-                />
-            <ImageButton
-                android:id="@+id/forward"
-                android:layout_marginRight="16dip"
-                android:contentDescription="@string/forward_action"
-                android:src="@drawable/ic_forward_holo_dark"
-                android:visibility="gone"
-                style="@style/message_view_action_buttons"
-                />
-            <ImageButton
-                android:id="@+id/favorite"
-                android:layout_marginRight="16dip"
-                android:src="@drawable/btn_star_off_normal_holo_light"
-                style="@style/message_view_action_buttons"
-                />
-        </LinearLayout>
-
-        <!-- presence, sender address, sender name: make them center_vertical -->
-        <LinearLayout
-            android:id="@+id/presence_from_name"
-            android:layout_width="0dip"
-            android:layout_height="0dip"
-            android:layout_alignTop="@id/header_background"
-            android:layout_alignBottom="@id/header_background"
-            android:layout_alignLeft="@id/header_background"
-            android:layout_toLeftOf="@id/forward_reply_buttons"
-            android:orientation="vertical"
-            android:gravity="center_vertical"
-            >
-            <LinearLayout
-                android:id="@+id/presence_from_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:gravity="center|center_vertical"
-                >
-                <!-- Presence icon -->
-                <ImageView
-                    android:id="@+id/presence"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:layout_marginLeft="8dip"
-                    android:layout_marginRight="8dip"
-                    android:src="@android:drawable/presence_offline"
-                    />
-                <!-- Sender display name -->
-                <TextView
-                    android:id="@+id/from_name"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:textSize="18dip"
-                    android:textColor="@color/text_primary_color_inverse"
-                    android:textStyle="bold"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-            </LinearLayout>
-            <!-- From address -->
-            <TextView
-                android:id="@+id/from_address"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dip"
-                android:layout_marginLeft="34dip"
-                android:textSize="14dip"
-                android:textColor="@color/text_secondary_color_inverse"
-                android:singleLine="true"
-                android:ellipsize="end"
-                />
-        </LinearLayout>
+            <include layout="@layout/message_view_header_upper" />
+        </FrameLayout>
 
         <!-- Addresses, timestamp  -->
         <FrameLayout
@@ -187,7 +76,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="32dip"
             android:layout_marginRight="32dip"
-            android:layout_below="@id/header_background"
+            android:layout_below="@id/message_view_header_upper"
             >
             <include layout="@layout/message_view_subheader" />
         </FrameLayout>
@@ -196,8 +85,8 @@
             android:id="@+id/address_divider"
             android:layout_width="0dip"
             android:layout_below="@id/message_view_subheader"
-            android:layout_alignLeft="@id/badge"
-            android:layout_alignRight="@id/header_background"
+            android:layout_alignLeft="@id/message_view_header_upper"
+            android:layout_alignRight="@id/message_view_header_upper"
             style="@style/message_view_horizontal_divider"
             />
 
@@ -209,8 +98,8 @@
             android:layout_width="0dip"
             android:layout_height="0dip"
             android:layout_below="@id/address_divider"
-            android:layout_alignLeft="@id/badge"
-            android:layout_alignRight="@id/header_background"
+            android:layout_alignLeft="@id/message_view_header_upper"
+            android:layout_alignRight="@id/message_view_header_upper"
             android:layout_alignParentBottom="true"
             android:orientation="vertical"
             >
diff --git a/res/layout-sw600dp/message_view_header_actions.xml b/res/layout-sw600dp/message_view_header_actions.xml
new file mode 100644
index 000000000..0e01967e7
--- /dev/null
+++ b/res/layout-sw600dp/message_view_header_actions.xml
@@ -0,0 +1,47 @@
+<?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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <ImageButton
+        android:id="@+id/reply"
+        style="@style/message_view_action_buttons"
+        android:src="@drawable/ic_reply_holo_dark"
+        android:contentDescription="@string/reply_action"
+        android:baselineAlignBottom="true"
+        />
+    <ImageButton
+        android:id="@+id/reply_all"
+        style="@style/message_view_action_buttons"
+        android:src="@drawable/ic_reply_all_holo_dark"
+        android:contentDescription="@string/reply_all_action"
+        android:baselineAlignBottom="true"
+        />
+    <ImageButton
+        android:id="@+id/forward"
+        style="@style/message_view_action_buttons"
+        android:src="@drawable/ic_forward_holo_dark"
+        android:contentDescription="@string/forward_action"
+        android:baselineAlignBottom="true"
+        />
+    <ImageButton
+        android:id="@+id/favorite"
+        style="@style/message_view_action_buttons"
+        android:src="@drawable/btn_star_off_normal_holo_light"
+        android:contentDescription="@string/favorite_action"
+        android:baselineAlignBottom="true"
+        />
+</merge>
+
diff --git a/res/layout/message_view_fragment.xml b/res/layout/message_view_fragment.xml
index 72caf905c..09b4772c7 100644
--- a/res/layout/message_view_fragment.xml
+++ b/res/layout/message_view_fragment.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ffffffff"
+    android:background="@android:color/white"
     >
     <ProgressBar
         android:id="@+id/loading_progress"
@@ -38,97 +38,39 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             >
-            <!-- header area -->
-            <LinearLayout
+            <TextView
+                android:id="@+id/subject"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
+                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"
+                />
+            <!-- Upper header area. -->
+            <include layout="@layout/message_view_header_upper" />
+
+            <!-- Addresses, timestamp, "show details" -->
+            <FrameLayout
+                android:id="@+id/message_view_subheader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
                 >
-                <TextView
-                    android:id="@+id/subject"
-                    android:layout_width="match_parent"
-                    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"
-                    />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="48dip"
-                    android:baselineAligned="true"
-                    android:background="@color/message_view_header_color"
-                    android:gravity="center_vertical"
-                    >
-                    <ImageView
-                        android:id="@+id/badge"
-                        android:layout_width="48dip"
-                        android:layout_height="48dip"
-                        />
-                    <View
-                        android:layout_width="1dip"
-                        android:layout_height="match_parent"
-                        android:background="#fff"
-                        />
-                    <ImageView
-                        android:id="@+id/presence"
-                        android:src="@android:drawable/presence_offline"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginRight="2dip"
-                        />
-                    <RelativeLayout
-                        android:layout_width="0dip"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        >
-                        <TextView
-                            android:id="@+id/from_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textSize="16dip"
-                            android:textColor="@color/text_primary_color_inverse"
-                            android:singleLine="true"
-                            android:ellipsize="end"
-                            />
-                        <TextView
-                            android:id="@+id/from_address"
-                            android:layout_below="@+id/from_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textSize="14dip"
-                            android:textColor="@color/text_secondary_color_inverse"
-                            android:singleLine="true"
-                            android:ellipsize="end"
-                            />
-                    </RelativeLayout>
-                    <include layout="@layout/message_view_header_actions" />
-                </LinearLayout>
+                <include layout="@layout/message_view_subheader" />
+            </FrameLayout>
 
-                <!-- Addresses, timestamp, "show details" -->
-                <FrameLayout
-                    android:id="@+id/message_view_subheader"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginRight="16dip"
-                    >
-                    <include layout="@layout/message_view_subheader" />
-                </FrameLayout>
-
-                <!-- divider -->
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_marginLeft="16dip"
-                    android:layout_marginRight="16dip"
-                    style="@style/message_view_horizontal_divider"
-                    />
-
-            </LinearLayout>
-            <!-- end of header area -->
+            <!-- divider -->
+            <View
+                android:layout_width="match_parent"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                style="@style/message_view_horizontal_divider"
+                />
 
             <LinearLayout
                 android:id="@+id/message_tabs_section"
diff --git a/res/layout/message_view_header_actions.xml b/res/layout/message_view_header_actions.xml
index 537e82fd0..4ae7e3462 100644
--- a/res/layout/message_view_header_actions.xml
+++ b/res/layout/message_view_header_actions.xml
@@ -15,20 +15,16 @@
 -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView
+    <ImageButton
         android:id="@+id/favorite"
+        style="@style/message_view_action_buttons"
         android:src="@drawable/btn_star_off_normal_holo_light"
-        android:layout_width="32dip"
-        android:layout_height="24dip"
-        android:layout_margin="6dip"
+        android:contentDescription="@string/favorite_action"
         />
-    <ImageView
+    <ImageButton
         android:id="@+id/reply"
+        style="@style/message_view_action_buttons"
         android:src="@drawable/ic_reply_holo_dark"
-        android:layout_width="32dip"
-        android:layout_height="24dip"
-        android:layout_margin="6dip"
-        android:baselineAlignBottom="true"
         android:contentDescription="@string/reply_action"
         />
     <View
@@ -37,12 +33,11 @@
         android:layout_margin="3dip"
         android:background="#ddd"
         />
-    <ImageView
+    <ImageButton
         android:id="@+id/more"
         style="@android:style/Widget.Holo.ActionButton.Overflow"
-        android:layout_width="32dip"
+        android:layout_width="24dip"
         android:layout_height="24dip"
         android:layout_margin="6dip"
-        android:baselineAlignBottom="true"
         />
 </merge>
diff --git a/res/layout/message_view_header_upper.xml b/res/layout/message_view_header_upper.xml
new file mode 100644
index 000000000..385766f68
--- /dev/null
+++ b/res/layout/message_view_header_upper.xml
@@ -0,0 +1,75 @@
+<?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.
+-->
+
+<!-- Upper header area for a message view. This contains the message actions
+     (e.g. reply, forward), and sender info -->
+<!-- Note the bottom padding is to compensate for the drop shadow in the asset -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/message_header_height"
+    android:paddingBottom="@dimen/message_header_bottom_padding"
+    android:background="@drawable/message_header_bg_holo"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    >
+    <QuickContactBadge
+        android:id="@+id/badge"
+        android:layout_width="@dimen/message_header_badge_width"
+        android:layout_height="@dimen/message_header_badge_width"
+        android:scaleType="centerCrop"
+        />
+    <View
+        android:layout_width="1dip"
+        android:layout_height="match_parent"
+        android:background="@android:color/white"
+        />
+    <RelativeLayout
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginLeft="@dimen/message_header_name_margin"
+        >
+        <TextView
+            android:id="@+id/from_name"
+            style="@style/message_header_sender_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+        <ImageView
+            android:id="@+id/presence"
+            android:src="@android:drawable/presence_offline"
+            android:layout_below="@+id/from_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="2dip"
+            />
+        <TextView
+            android:id="@+id/from_address"
+            style="@style/message_header_sender_address"
+            android:layout_below="@+id/from_name"
+            android:layout_toRightOf="@+id/presence"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14dip"
+            android:textColor="@color/text_secondary_color_inverse"
+            android:singleLine="true"
+            android:ellipsize="end"
+            />
+    </RelativeLayout>
+    <include layout="@layout/message_view_header_actions" />
+</LinearLayout>
+
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index db4d51f28..1245fc070 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -46,4 +46,12 @@
     <style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
         <item name="android:minHeight">40dip</item>
     </style>
+
+    <style name="message_view_action_buttons" parent="android:Widget.Holo.Button.Borderless">
+        <item name="android:layout_width">32dip</item>
+        <item name="android:layout_height">24dip</item>
+        <item name="android:layout_marginLeft">8dip</item>
+        <item name="android:layout_marginRight">8dip</item>
+        <item name="android:padding">2dip</item>
+    </style>
 </resources>
diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml
index a427c87d2..a8141ee39 100644
--- a/res/values-sw600dp/dimensions.xml
+++ b/res/values-sw600dp/dimensions.xml
@@ -16,6 +16,12 @@
 
 <!-- tablet -->
 <resources>
+    <!-- Bottom padding used to compensate for the built in drop shadow in the
+         asset. -->
+    <dimen name="message_header_height">68dip</dimen>
+    <dimen name="message_header_bottom_padding">4dip</dimen>
+    <dimen name="message_header_badge_width">64dip</dimen>
+    <dimen name="message_header_name_margin">16dip</dimen>
 
     <!-- Account Setup Activities -->
     <!-- inset distance for setup/settings buttons -->
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 1b2aadfb7..05ad1c731 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -105,9 +105,26 @@
         <item name="android:textColor">@color/text_primary_color</item>
         <item name="android:singleLine">true</item>
     </style>
+
+    <style name="message_header_sender_name">
+        <item name="android:textSize">18dip</item>
+        <item name="android:textColor">@color/text_primary_color_inverse</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="message_header_sender_address">
+        <item name="android:textSize">14dip</item>
+        <item name="android:textColor">@color/text_secondary_color_inverse</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
     <style name="message_view_action_buttons" parent="android:Widget.Holo.Button.Borderless">
         <item name="android:layout_width">48dip</item>
         <item name="android:layout_height">48dip</item>
+        <item name="android:layout_marginRight">16dip</item>
         <item name="android:padding">8dip</item>
     </style>
 
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index eceb3161b..596d296a9 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -23,6 +23,13 @@
     <dimen name="message_list_item_color_tip_width">35dip</dimen>
     <dimen name="message_list_item_color_tip_height">6dip</dimen>
 
+    <!-- Bottom padding used to compensate for the built in drop shadow in the
+         asset. -->
+    <dimen name="message_header_height">52dip</dimen>
+    <dimen name="message_header_bottom_padding">4dip</dimen>
+    <dimen name="message_header_badge_width">48dip</dimen>
+    <dimen name="message_header_name_margin">4dip</dimen>
+
     <dimen name="error_message_height">48dip</dimen>
 
     <dimen name="widget_senders_font_size">14sp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f95aedd58..4d66cfcb9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,8 +23,6 @@
     <!-- Do Not Translate.  Unused string. -->
     <string name="read_unread_action"/>
     <!-- Do Not Translate.  Unused string. -->
-    <string name="favorite_action"/>
-    <!-- Do Not Translate.  Unused string. -->
     <string name="deselect_all_action"/>
     <!-- Do Not Translate.  Unused string. -->
     <string name="remove_account_action"/>
@@ -99,6 +97,9 @@
     <string name="delete_action">Delete</string>
     <!-- Menu item/button name -->
     <string name="forward_action">Forward</string>
+    <!-- Menu/Button item name and label for marking a message as a favorite
+         (usually called starred) [CHAR LIMIT=40] -->
+    <string name="favorite_action">Star</string>
     <!--  Button name used to complete a multi-step process -->
     <string name="done_action">Done</string>
     <!--  Button name used to create a new quick response [CHAR_LIMIT=16] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 65003c7e6..fd71530a0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -201,5 +201,27 @@
     <style name="message_list_item_wide">
         <!-- no styles on phones -->
     </style>
+
+    <style name="message_view_action_buttons" parent="android:Widget.Holo.Button.Borderless">
+        <item name="android:layout_width">24dip</item>
+        <item name="android:layout_height">24dip</item>
+        <item name="android:layout_marginLeft">8dip</item>
+        <item name="android:layout_marginRight">8dip</item>
+        <item name="android:padding">2dip</item>
+    </style>
+
+    <style name="message_header_sender_name">
+        <item name="android:textSize">16dip</item>
+        <item name="android:textColor">@color/text_primary_color_inverse</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="message_header_sender_address">
+        <item name="android:textSize">14dip</item>
+        <item name="android:textColor">@color/text_secondary_color_inverse</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
 </resources>