From b052885ea3625469970c4b4ea724ebd10ebed2c0 Mon Sep 17 00:00:00 2001
From: Mihai Preda <preda@google.com>
Date: Wed, 10 Feb 2010 16:46:41 +0100
Subject: [PATCH] Email: husky title for MessageList & MailboxList.

Bug: 2419716
---
 AndroidManifest.xml                           |   6 +-
 res/drawable-hdpi/one_pixel_border.9.png      | Bin 0 -> 752 bytes
 .../one_pixel_border_pressed.9.png            | Bin 0 -> 775 bytes
 .../one_pixel_border_selected.9.png           | Bin 0 -> 775 bytes
 res/drawable-mdpi/one_pixel_border.9.png      | Bin 0 -> 725 bytes
 .../one_pixel_border_pressed.9.png            | Bin 0 -> 749 bytes
 .../one_pixel_border_selected.9.png           | Bin 0 -> 749 bytes
 res/drawable/one_pixel_border_button.xml      |  26 +++++++
 res/layout/list_title.xml                     |  18 ++++-
 res/layout/mailbox_list.xml                   |   1 +
 res/layout/message_list.xml                   |   1 +
 res/values/styles.xml                         |   5 ++
 .../android/email/activity/MailboxList.java   |  62 +++++++++++------
 .../android/email/activity/MessageList.java   |  64 +++++++++++-------
 14 files changed, 137 insertions(+), 46 deletions(-)
 create mode 100644 res/drawable-hdpi/one_pixel_border.9.png
 create mode 100644 res/drawable-hdpi/one_pixel_border_pressed.9.png
 create mode 100644 res/drawable-hdpi/one_pixel_border_selected.9.png
 create mode 100644 res/drawable-mdpi/one_pixel_border.9.png
 create mode 100644 res/drawable-mdpi/one_pixel_border_pressed.9.png
 create mode 100644 res/drawable-mdpi/one_pixel_border_selected.9.png
 create mode 100644 res/drawable/one_pixel_border_button.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 473ca67f9..0021c14fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -148,11 +148,13 @@
         </activity>
         
         <activity
-            android:name=".activity.MailboxList">
+            android:name=".activity.MailboxList"
+            android:theme="@style/ThemeNoTitleBar">
         </activity>
         
         <activity
-            android:name=".activity.MessageList">
+            android:name=".activity.MessageList"
+            android:theme="@style/ThemeNoTitleBar">
             <intent-filter>
                 <!-- This action is only to allow an entry point for launcher shortcuts -->
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/drawable-hdpi/one_pixel_border.9.png b/res/drawable-hdpi/one_pixel_border.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..03ffc263878cd454ecbc869109890de7c892ca69
GIT binary patch
literal 752
zcmV<M0uTL(P)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-0006%X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlgn!pQ543%Nsx-vszuvwgh51IM42Rox-)GaC2fcyNr{S^>CEJz
z$z+_FM6E9RH@I^l3c7F++(@yAi@FgJL`CqmaqGS!LaFh)Gfvut#f@jUbANOA&bepK
zy%z|7S1qd<0?;yDyEr=|pF4j+9{K_ahp>lZpQ<_5bfJ)=WC#24foj_OlOk6ty4vgA
z{kU@E#hYhe&pf)gLr~xzvAG~1Md&zK^En}S(dV+@tFGlzQx~k&Rh@j39I?yAB>5qE
zq~`Og;6<Nb3hrt(5&Ma(n0mtmLc7VQb;Hrf335$$v=*6pB(z#><`0XUCp61uZ1^qt
zsOSr4T6>n^zv#cU<x^S53cE0|&39}b7(EO;k+yW}V_vVMu~$wt9`n*k!#1$%XTQHr
z?a)(T)9&{-?)3Yc54gr>VC{<5vAdp@1xl}he|`J^>}Lnw@gHd39{rvDzIZAHxW5LJ
zmw_DT+nkS&0|#yZ1<;>BC>{@n-$S~Ay{U9AC&wn0sY*r&|Esl{9qyH9qkIpWi}|yh
zCpf-YZlN5o(=DX~t~N5+fOR#+z3}x*^<+Nas+}nYd`X=Xb$dAtbD<Ql)%4E(pS5NN
zdc#Q%G)whzCD7ZQ;zGce+w%jxZlngana#YoPhQT3n;q1T6w=7?krBfr6ilIl3=004
zWCZs2fP3T7xoGM6V`o`-wwr5Q^Y%K~wyxWaTHTeWc_WR8oHeym5jmzr75oOKBe6UG
zvh3La003-BL_t(26{S*J4!|G?)7}5h45HzKw&F6rggzv|80WAPJQ-*nwLU#+4RR(7
zlB%acN07J#(t16B2ZbW2>E_#0fiHQ8VY0UdA?{Zo+<vv4p0`7jJPGVCI$T~76VhQ(
iBDrlU_Ac4_fcpZ#(L>VjtEd|Q0000<MNUMnLSTaDzi7z-

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/one_pixel_border_pressed.9.png b/res/drawable-hdpi/one_pixel_border_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d12cdb9d773bbafd0fa4b2da2fe92a652500fc8
GIT binary patch
literal 775
zcmV+i1Ni)jP)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-0006%X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlgn!pQ543%Nsx-vszuvwgh51IM42Rox-)GaC2fcyNr{S^>CEJz
z$z+_FM6E9RH@I^l3c7F++(@yAi@FgJL`CqmaqGS!LaFh)Gfvut#f@jUbANOA&bepK
zy%z|7S1qd<0?;yDyEr=|pF4j+9{K_ahp>lZpQ<_5bfJ)=WC#24foj_OlOk6ty4vgA
z{kU@E#hYhe&pf)gLr~xzvAG~1Md&zK^En}S(dV+@tFGlzQx~k&Rh@j39I?yAB>5qE
zq~`Og;6<Nb3hrt(5&Ma(n0mtmLc7VQb;Hrf335$$v=*6pB(z#><`0XUCp61uZ1^qt
zsOSr4T6>n^zv#cU<x^S53cE0|&39}b7(EO;k+yW}V_vVMu~$wt9`n*k!#1$%XTQHr
z?a)(T)9&{-?)3Yc54gr>VC{<5vAdp@1xl}he|`J^>}Lnw@gHd39{rvDzIZAHxW5LJ
zmw_DT+nkS&0|#yZ1<;>BC>{@n-$S~Ay{U9AC&wn0sY*r&|Esl{9qyH9qkIpWi}|yh
zCpf-YZlN5o(=DX~t~N5+fOR#+z3}x*^<+Nas+}nYd`X=Xb$dAtbD<Ql)%4E(pS5NN
zdc#Q%G)whzCD7ZQ;zGce+w%jxZlngana#YoPhQT3n;q1T6w=7?krBfr6ilIl3=004
zWCZs2fP3T7xoGM6V`o`-wwr5Q^Y%K~wyxWaTHTeWc_WR8oHeym5jmzr75oOKBe6UG
zvh3La004tYL_t(26{V8h4S+BRgsE`@$8$c%bB5Y8LMUKMl$R#QeMkR@##Kk{5;bcp
ztCv<*Tde@_Je-f9+knpX2J(PyucQM6o`F%o4QD|UKnn|BR>1CNvq6C6+*ycyzqTz?
zvzMlyOJHne7N9}+J9rde!4T#Eth)5iV%<%C8qxDP?*(asKBN3j_^ki{002ovPDHLk
FV1i25bvXb4

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/one_pixel_border_selected.9.png b/res/drawable-hdpi/one_pixel_border_selected.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..9edf27f36b3687959550d8ebeadff47e976b2005
GIT binary patch
literal 775
zcmV+i1Ni)jP)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-0006%X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlgn!pQ543%Nsx-vszuvwgh51IM42Rox-)GaC2fcyNr{S^>CEJz
z$z+_FM6E9RH@I^l3c7F++(@yAi@FgJL`CqmaqGS!LaFh)Gfvut#f@jUbANOA&bepK
zy%z|7S1qd<0?;yDyEr=|pF4j+9{K_ahp>lZpQ<_5bfJ)=WC#24foj_OlOk6ty4vgA
z{kU@E#hYhe&pf)gLr~xzvAG~1Md&zK^En}S(dV+@tFGlzQx~k&Rh@j39I?yAB>5qE
zq~`Og;6<Nb3hrt(5&Ma(n0mtmLc7VQb;Hrf335$$v=*6pB(z#><`0XUCp61uZ1^qt
zsOSr4T6>n^zv#cU<x^S53cE0|&39}b7(EO;k+yW}V_vVMu~$wt9`n*k!#1$%XTQHr
z?a)(T)9&{-?)3Yc54gr>VC{<5vAdp@1xl}he|`J^>}Lnw@gHd39{rvDzIZAHxW5LJ
zmw_DT+nkS&0|#yZ1<;>BC>{@n-$S~Ay{U9AC&wn0sY*r&|Esl{9qyH9qkIpWi}|yh
zCpf-YZlN5o(=DX~t~N5+fOR#+z3}x*^<+Nas+}nYd`X=Xb$dAtbD<Ql)%4E(pS5NN
zdc#Q%G)whzCD7ZQ;zGce+w%jxZlngana#YoPhQT3n;q1T6w=7?krBfr6ilIl3=004
zWCZs2fP3T7xoGM6V`o`-wwr5Q^Y%K~wyxWaTHTeWc_WR8oHeym5jmzr75oOKBe6UG
zvh3La004tYL_t(26{V8h4S+BRgsE`=hjc85bc5P6LMUKMl$R#QeMkR@##Kk{5;bcp
ztCv<*Tde@_+?|i0+knpX2J(RIsH6h~o`F%o4QD|UKnn|BR>1CNvq6C6+*ycyzqTz?
zvzMlyOJHne7N9}+J9rde!4T#Eth)5iV%<%C8qxDP?*)K7K4ruk7()O6002ovPDHLk
FV1h(qbDIDF

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/one_pixel_border.9.png b/res/drawable-mdpi/one_pixel_border.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b12da515c6bd458d99658eaa7d855a71c810f071
GIT binary patch
literal 725
zcmV;`0xJE9P)<h;3K|Lk000e1NJLTq000XB000XJ1^@s6sjPP<0006%X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlgn!pQ543%Nsx-vszuvwgh51IM42Rox-)GaC2fcyNr{S^>CEJz
z$z+_FM6E9RH@I^l3c7F++(@yAi@FgJL`CqmaqGS!LaFh)Gfvut#f@jUbANOA&bepK
zy%z|7S1qd<0?;yDyEr=|pF4j+9{K_ahp>lZpQ<_5bfJ)=WC#24foj_OlOk6ty4vgA
z{kU@E#hYhe&pf)gLr~xzvAG~1Md&zK^En}S(dV+@tFGlzQx~k&Rh@j39I?yAB>5qE
zq~`Og;6<Nb3hrt(5&Ma(n0mtmLc7VQb;Hrf335$$v=*6pB(z#><`0XUCp61uZ1^qt
zsOSr4T6>n^zv#cU<x^S53cE0|&39}b7(EO;k+yW}V_vVMu~$wt9`n*k!#1$%XTQHr
z?a)(T)9&{-?)3Yc54gr>VC{<5vAdp@1xl}he|`J^>}Lnw@gHd39{rvDzIZAHxW5LJ
zmw_DT+nkS&0|#yZ1<;>BC>{@n-$S~Ay{U9AC&wn0sY*r&|Esl{9qyH9qkIpWi}|yh
zCpf-YZlN5o(=DX~t~N5+fOR#+z3}x*^<+Nas+}nYd`X=Xb$dAtbD<Ql)%4E(pS5NN
zdc#Q%G)whzCD7ZQ;zGce+w%jxZlngana#YoPhQT3n;q1T6w=7?krBfr6ilIl3=004
zWCZs2fP3T7xoGM6V`o`-wwr5Q^Y%K~wyxWaTHTeWc_WR8oHeym5jmzr75oOKBe6UG
zvh3La002=*L_t&-8Ff%W4geqs%Kran(^bwOyrh5yjqxx4!G@qmUCg3xPiGe<iE}L|
zf^Y)rirpOEXTAoU98;`As5NCp;glYQWT6Z2pGh1xd*Fv(*nl(MY^HRJ00000NkvXX
Hu0mjfFH>8L

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/one_pixel_border_pressed.9.png b/res/drawable-mdpi/one_pixel_border_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f02767d8e753c163b16c0a926e6c8aac9b8a1af
GIT binary patch
literal 749
zcmV<J0uud+P)<h;3K|Lk000e1NJLTq000XB000XJ1^@s6sjPP<0006%X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlgn!pQ543%Nsx-vszuvwgh51IM42Rox-)GaC2fcyNr{S^>CEJz
z$z+_FM6E9RH@I^l3c7F++(@yAi@FgJL`CqmaqGS!LaFh)Gfvut#f@jUbANOA&bepK
zy%z|7S1qd<0?;yDyEr=|pF4j+9{K_ahp>lZpQ<_5bfJ)=WC#24foj_OlOk6ty4vgA
z{kU@E#hYhe&pf)gLr~xzvAG~1Md&zK^En}S(dV+@tFGlzQx~k&Rh@j39I?yAB>5qE
zq~`Og;6<Nb3hrt(5&Ma(n0mtmLc7VQb;Hrf335$$v=*6pB(z#><`0XUCp61uZ1^qt
zsOSr4T6>n^zv#cU<x^S53cE0|&39}b7(EO;k+yW}V_vVMu~$wt9`n*k!#1$%XTQHr
z?a)(T)9&{-?)3Yc54gr>VC{<5vAdp@1xl}he|`J^>}Lnw@gHd39{rvDzIZAHxW5LJ
zmw_DT+nkS&0|#yZ1<;>BC>{@n-$S~Ay{U9AC&wn0sY*r&|Esl{9qyH9qkIpWi}|yh
zCpf-YZlN5o(=DX~t~N5+fOR#+z3}x*^<+Nas+}nYd`X=Xb$dAtbD<Ql)%4E(pS5NN
zdc#Q%G)whzCD7ZQ;zGce+w%jxZlngana#YoPhQT3n;q1T6w=7?krBfr6ilIl3=004
zWCZs2fP3T7xoGM6V`o`-wwr5Q^Y%K~wyxWaTHTeWc_WR8oHeym5jmzr75oOKBe6UG
zvh3La003!8L_t&-8Fi4+5r8lVL#gKmj^})i=L`tmC5>440m2JMYqkzw$)k!M0c}K}
z&b(`r;C;<`_G;jyf>?5#ZZN!X2Nr{EA@D{FyPPmj=^*F?yHkEQ!&waqCd18YK#gBu
fk3zCO__OQ*h2k)s6=hHQ00000NkvXXu0mjfox^6i

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/one_pixel_border_selected.9.png b/res/drawable-mdpi/one_pixel_border_selected.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..58c55108f97cf8a688319b7a2ca47b69dca0bfda
GIT binary patch
literal 749
zcmV<J0uud+P)<h;3K|Lk000e1NJLTq000XB000XJ1^@s6sjPP<0006%X+uL$Nkc;*
zP;zf(X>4Tx0C)kdlgn!pQ543%Nsx-vszuvwgh51IM42Rox-)GaC2fcyNr{S^>CEJz
z$z+_FM6E9RH@I^l3c7F++(@yAi@FgJL`CqmaqGS!LaFh)Gfvut#f@jUbANOA&bepK
zy%z|7S1qd<0?;yDyEr=|pF4j+9{K_ahp>lZpQ<_5bfJ)=WC#24foj_OlOk6ty4vgA
z{kU@E#hYhe&pf)gLr~xzvAG~1Md&zK^En}S(dV+@tFGlzQx~k&Rh@j39I?yAB>5qE
zq~`Og;6<Nb3hrt(5&Ma(n0mtmLc7VQb;Hrf335$$v=*6pB(z#><`0XUCp61uZ1^qt
zsOSr4T6>n^zv#cU<x^S53cE0|&39}b7(EO;k+yW}V_vVMu~$wt9`n*k!#1$%XTQHr
z?a)(T)9&{-?)3Yc54gr>VC{<5vAdp@1xl}he|`J^>}Lnw@gHd39{rvDzIZAHxW5LJ
zmw_DT+nkS&0|#yZ1<;>BC>{@n-$S~Ay{U9AC&wn0sY*r&|Esl{9qyH9qkIpWi}|yh
zCpf-YZlN5o(=DX~t~N5+fOR#+z3}x*^<+Nas+}nYd`X=Xb$dAtbD<Ql)%4E(pS5NN
zdc#Q%G)whzCD7ZQ;zGce+w%jxZlngana#YoPhQT3n;q1T6w=7?krBfr6ilIl3=004
zWCZs2fP3T7xoGM6V`o`-wwr5Q^Y%K~wyxWaTHTeWc_WR8oHeym5jmzr75oOKBe6UG
zvh3La003!8L_t&-8Fi4+5r8lVL#gKg4(V79=>`biC5>440m2JMYqkzw$)k!M0c}K}
z&b(`r;C;?{_G;jyf>?4~ZZN!X2Nr{EA@D{FyPPmj=^*F?yHkEQ!&waqCd18YK#gBu
fk3zCO__OQ*6w5GQd=Om400000NkvXXu0mjf0p?_K

literal 0
HcmV?d00001

diff --git a/res/drawable/one_pixel_border_button.xml b/res/drawable/one_pixel_border_button.xml
new file mode 100644
index 000000000..3688f4d13
--- /dev/null
+++ b/res/drawable/one_pixel_border_button.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_window_focused="false" android:state_enabled="true"
+        android:drawable="@drawable/one_pixel_border" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/one_pixel_border_pressed" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/one_pixel_border_selected" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/one_pixel_border" />
+</selector>
diff --git a/res/layout/list_title.xml b/res/layout/list_title.xml
index b59263e0c..8dfb39a3b 100644
--- a/res/layout/list_title.xml
+++ b/res/layout/list_title.xml
@@ -19,8 +19,9 @@
         android:id="@+id/screen"
         android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical">
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:background="@android:drawable/title_bar">
 
     <TextView android:id="@+id/title_left_text"
             android:gravity="center_vertical|left"
@@ -43,6 +44,19 @@
             android:shadowColor="#ff000000"
             android:layout_weight="1" />
 
+    <Button android:id="@+id/account_title_button"
+            android:gravity="center_vertical|right"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="26dip"
+            android:textColor="#ffffffff"
+            android:layout_margin="3dip"
+            android:paddingTop="0dip"
+            android:paddingBottom="0dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:background="@drawable/one_pixel_border_button" />
+
     <ProgressBar android:id="@+id/title_progress_icon"
             style="?android:attr/progressBarStyleSmallTitle"
             android:visibility="gone"
diff --git a/res/layout/mailbox_list.xml b/res/layout/mailbox_list.xml
index e2f58dc5c..1e2429abb 100644
--- a/res/layout/mailbox_list.xml
+++ b/res/layout/mailbox_list.xml
@@ -20,6 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <include layout="@layout/list_title" />
     <include layout="@layout/connection_error_banner" />
 
     <ListView
diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
index 2a7f857e6..147aad989 100644
--- a/res/layout/message_list.xml
+++ b/res/layout/message_list.xml
@@ -20,6 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <include layout="@layout/list_title" />
     <include layout="@layout/connection_error_banner" />
 
     <ListView
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 21e96f332..786fef944 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -28,4 +28,9 @@
         <item name="android:maxWidth">48dip</item>
         <item name="android:gravity">center_horizontal|center_vertical</item>
     </style>
+
+    <style name="ThemeNoTitleBar" parent="android:Theme.NoTitleBar">
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
 </resources>
diff --git a/src/com/android/email/activity/MailboxList.java b/src/com/android/email/activity/MailboxList.java
index a806e9493..776249a5a 100644
--- a/src/com/android/email/activity/MailboxList.java
+++ b/src/com/android/email/activity/MailboxList.java
@@ -32,6 +32,7 @@ import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.provider.EmailContent.MessageColumns;
 
+import android.app.Activity;
 import android.app.ListActivity;
 import android.content.ContentUris;
 import android.content.Context;
@@ -47,11 +48,13 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
+import android.widget.Button;
 import android.widget.CursorAdapter;
 import android.widget.ImageView;
 import android.widget.ListView;
@@ -59,7 +62,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.AdapterView.OnItemClickListener;
 
-public class MailboxList extends ListActivity implements OnItemClickListener {
+public class MailboxList extends ListActivity implements OnItemClickListener, OnClickListener {
 
     // Intent extras (internal to this activity)
     private static final String EXTRA_ACCOUNT_ID = "com.android.email.activity._ACCOUNT_ID";
@@ -82,7 +85,7 @@ public class MailboxList extends ListActivity implements OnItemClickListener {
     // DB access
     private long mAccountId;
     private LoadMailboxesTask mLoadMailboxesTask;
-    private AsyncTask<Void, Void, String> mLoadAccountNameTask;
+    private AsyncTask<Void, Void, Object[]> mLoadAccountNameTask;
     private MessageCountTask mMessageCountTask;
 
     private long mDraftMailboxKey = -1;
@@ -106,11 +109,7 @@ public class MailboxList extends ListActivity implements OnItemClickListener {
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
-        requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
         setContentView(R.layout.mailbox_list);
-        getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE,
-                R.layout.list_title);
 
         mListView = getListView();
         mProgressIcon = (ProgressBar) findViewById(R.id.title_progress_icon);
@@ -123,6 +122,8 @@ public class MailboxList extends ListActivity implements OnItemClickListener {
         mListAdapter = new MailboxListAdapter(this);
         setListAdapter(mListAdapter);
 
+        ((Button) findViewById(R.id.account_title_button)).setOnClickListener(this);
+
         mAccountId = getIntent().getLongExtra(EXTRA_ACCOUNT_ID, -1);
         if (mAccountId != -1) {
             mLoadMailboxesTask = new LoadMailboxesTask(mAccountId);
@@ -134,37 +135,38 @@ public class MailboxList extends ListActivity implements OnItemClickListener {
         ((TextView)findViewById(R.id.title_left_text)).setText(R.string.mailbox_list_title);
 
         // Go to the database for the account name
-        mLoadAccountNameTask = new AsyncTask<Void, Void, String>() {
+        mLoadAccountNameTask = new AsyncTask<Void, Void, Object[]>() {
             @Override
-            protected String doInBackground(Void... params) {
-                String result = null;
+            protected Object[] doInBackground(Void... params) {
+                String accountName = null;
                 Uri uri = ContentUris.withAppendedId(Account.CONTENT_URI, mAccountId);
                 Cursor c = MailboxList.this.getContentResolver().query(
                         uri, new String[] { AccountColumns.DISPLAY_NAME }, null, null, null);
                 try {
                     if (c.moveToFirst()) {
-                        result = c.getString(0);
+                        accountName = c.getString(0);
                     }
                 } finally {
                     c.close();
                 }
-                return result;
+                int nAccounts = EmailContent.count(MailboxList.this, Account.CONTENT_URI, null, null);
+                return new Object[] {accountName, nAccounts};
             }
  
             @Override
-            protected void onPostExecute(String result) {
-                /* doInBackground() returns null if the account name can't be retrieved from DB.
-                 * so we can't use null test for cancellation, instead use isCancelled().
-                 */
-                if (isCancelled()) {
+            protected void onPostExecute(Object[] result) {
+                if (result == null) {
                     return;
                 }
-                // result is null if account name can't be retrieved or query exception
-                if (result == null) {
+                final String accountName = (String) result[0];
+                // accountName is null if account name can't be retrieved or query exception
+                if (accountName == null) {
                     // something is wrong with this account
                     finish();
                 }
-                ((TextView)findViewById(R.id.title_right_text)).setText(result);
+
+                final int nAccounts = (Integer) result[1];
+                setTitleAccountName(accountName, nAccounts > 1);
             }
 
         }.execute();
@@ -206,6 +208,14 @@ public class MailboxList extends ListActivity implements OnItemClickListener {
         }
     }
 
+    public void onClick(View v) {
+        switch (v.getId()) {
+        case R.id.account_title_button:
+            onAccounts();
+            break;
+        }
+    }
+
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         onOpenMailbox(id);
     }
@@ -299,6 +309,20 @@ public class MailboxList extends ListActivity implements OnItemClickListener {
         MessageCompose.actionCompose(this, mAccountId);
     }
 
+    private void setTitleAccountName(String accountName, boolean showAccountsButton) {
+        TextView accountsButton = (TextView) findViewById(R.id.account_title_button);
+        TextView textPlain = (TextView) findViewById(R.id.title_right_text);
+        if (showAccountsButton) {
+            accountsButton.setVisibility(View.VISIBLE);
+            textPlain.setVisibility(View.GONE);
+            accountsButton.setText(accountName);
+        } else {
+            accountsButton.setVisibility(View.GONE);
+            textPlain.setVisibility(View.VISIBLE);
+            textPlain.setText(accountName);
+        }
+    }
+
     /**
      * Async task for loading the mailboxes for a given account
      */
diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index 8cd727123..4c972f08b 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -32,6 +32,7 @@ import com.android.email.provider.EmailContent.MailboxColumns;
 import com.android.email.provider.EmailContent.MessageColumns;
 import com.android.email.service.MailService;
 
+import android.app.Activity;
 import android.app.ListActivity;
 import android.app.NotificationManager;
 import android.content.ContentResolver;
@@ -111,7 +112,6 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
     private Controller mController = Controller.getInstance(getApplication());
     private ControllerResults mControllerCallback = new ControllerResults();
     private TextView mLeftTitle;
-    private TextView mRightTitle;
     private ProgressBar mProgressIcon;
 
     // DB access
@@ -220,11 +220,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
-        requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
         setContentView(R.layout.message_list);
-        getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE,
-                R.layout.list_title);
 
         mCanAutoRefresh = true;
         mListView = getListView();
@@ -233,13 +229,13 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
         mFavoriteButton = (Button) findViewById(R.id.btn_multi_favorite);
         mDeleteButton = (Button) findViewById(R.id.btn_multi_delete);
         mLeftTitle = (TextView) findViewById(R.id.title_left_text);
-        mRightTitle = (TextView) findViewById(R.id.title_right_text);
         mProgressIcon = (ProgressBar) findViewById(R.id.title_progress_icon);
         mErrorBanner = (TextView) findViewById(R.id.connection_error_text);
 
         mReadUnreadButton.setOnClickListener(this);
         mFavoriteButton.setOnClickListener(this);
         mDeleteButton.setOnClickListener(this);
+        ((Button) findViewById(R.id.account_title_button)).setOnClickListener(this);
 
         mListView.setOnItemClickListener(this);
         mListView.setItemsCanFocus(false);
@@ -403,6 +399,9 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
             case R.id.btn_multi_delete:
                 onMultiDelete(mListAdapter.getSelectedSet());
                 break;
+            case R.id.account_title_button:
+                onAccounts();
+                break;
         }
     }
 
@@ -1114,7 +1113,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
         }
     }
 
-    private class SetTitleTask extends AsyncTask<Void, Void, String[]> {
+    private class SetTitleTask extends AsyncTask<Void, Void, Object[]> {
 
         private long mMailboxKey;
 
@@ -1123,21 +1122,22 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
         }
 
         @Override
-        protected String[] doInBackground(Void... params) {
+        protected Object[] doInBackground(Void... params) {
             // Check special Mailboxes
+            int resIdSpecialMailbox = 0;
             if (mMailboxKey == Mailbox.QUERY_ALL_INBOXES) {
-                return new String[] {null,
-                        getString(R.string.account_folder_list_summary_inbox)};
+                resIdSpecialMailbox = R.string.account_folder_list_summary_inbox;
             } else if (mMailboxKey == Mailbox.QUERY_ALL_FAVORITES) {
-                return new String[] {null,
-                        getString(R.string.account_folder_list_summary_starred)};
+                resIdSpecialMailbox = R.string.account_folder_list_summary_starred;
             } else if (mMailboxKey == Mailbox.QUERY_ALL_DRAFTS) {
-                return new String[] {null,
-                        getString(R.string.account_folder_list_summary_drafts)};
+                resIdSpecialMailbox = R.string.account_folder_list_summary_drafts;
             } else if (mMailboxKey == Mailbox.QUERY_ALL_OUTBOX) {
-                return new String[] {null,
-                        getString(R.string.account_folder_list_summary_outbox)};
+                resIdSpecialMailbox = R.string.account_folder_list_summary_outbox;
             }
+            if (resIdSpecialMailbox != 0) {
+                return new Object[] {null, getString(resIdSpecialMailbox), 0};
+            }
+
             String accountName = null;
             String mailboxName = null;
             String accountKey = null;
@@ -1168,23 +1168,41 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
                     c.close();
                 }
             }
-            return new String[] {accountName, mailboxName};
+            int nAccounts = EmailContent.count(MessageList.this, Account.CONTENT_URI, null, null);
+            return new Object[] {accountName, mailboxName, nAccounts};
         }
 
         @Override
-        protected void onPostExecute(String[] names) {
-            if (names == null) {
+        protected void onPostExecute(Object[] result) {
+            if (result == null) {
                 return;
             }
-            if (names[0] != null) {
-                mRightTitle.setText(names[0]);
+
+            final int nAccounts = (Integer) result[2];
+            if (result[0] != null) {
+                setTitleAccountName((String) result[0], nAccounts > 1);
             }
-            if (names[1] != null) {
-                mLeftTitle.setText(names[1]);
+
+            if (result[1] != null) {
+                mLeftTitle.setText((String) result[1]);
             }
         }
     }
 
+    private void setTitleAccountName(String accountName, boolean showAccountsButton) {
+        TextView accountsButton = (TextView) findViewById(R.id.account_title_button);
+        TextView textPlain = (TextView) findViewById(R.id.title_right_text);
+        if (showAccountsButton) {
+            accountsButton.setVisibility(View.VISIBLE);
+            textPlain.setVisibility(View.GONE);
+            accountsButton.setText(accountName);
+        } else {
+            accountsButton.setVisibility(View.GONE);
+            textPlain.setVisibility(View.VISIBLE);
+            textPlain.setText(accountName);
+        }
+    }
+
     /**
      * Handler for UI-thread operations (when called from callbacks or any other threads)
      */