From 6d75ae39f0274651249150588789dfaa60a7077c Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Thu, 28 Apr 2011 16:28:24 -0700
Subject: [PATCH] Expose cc/attachment actions on UI directly

This is a simple change to move +cc/bcc and +attachment action buttons
from the options menu to the visible UI (like honeycomb).

No attempt was made at styling the actual fields yet.

Change-Id: Ia1de8dbcf5e9ec9f7d3be3787cab657a2df72d70
---
 res/drawable-hdpi/ic_menu_cc_holo_light.png   | Bin 0 -> 1636 bytes
 res/drawable-mdpi/ic_menu_cc_holo_light.png   | Bin 0 -> 1180 bytes
 res/layout/message_compose.xml                |  67 ++++++++++++------
 res/menu/message_compose_option.xml           |  10 ---
 .../email/activity/MessageCompose.java        |  13 ++--
 5 files changed, 51 insertions(+), 39 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_menu_cc_holo_light.png
 create mode 100644 res/drawable-mdpi/ic_menu_cc_holo_light.png

diff --git a/res/drawable-hdpi/ic_menu_cc_holo_light.png b/res/drawable-hdpi/ic_menu_cc_holo_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef5899e27f0f9e744c646e27c8c81873319c1e75
GIT binary patch
literal 1636
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

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_cc_holo_light.png b/res/drawable-mdpi/ic_menu_cc_holo_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..2697982b7033cee48a31e35341546ca7457fe2e5
GIT binary patch
literal 1180
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UOiAAEE)4(M`_JqL@;D1TB8!2v
z2N=7Z%(epwmK8Xr18D^?ZvQoBE&~Je5>FS$5Rc<Wr{?=yO%*wA|NQ6Qb>Vs|92}UJ
z7TsEwXqFPRmbds!iPyJ9;=XZT(sQqHPwp*Q8#+0nw}<y;mX%iS*FN1-`?UpL@b{Hi
zwJbf8X4Ng3$~oiU-s#o#=U*P(8}shyhx4<o&hLI+x$pU$_dn-7xA{;%`_791$t40W
zrpc==czyE9Y^R`y4DCxD9%M2^Dt8rG))fU;<h*@kvG}I?d+CTJ>n`bSyc@k>0mt+u
z4xD@bU%IgQBCF6ji(d!&p1tQz-Oe?O;ogCRu3}x6E_}Hyro$FG(=;e1@^|R8lB`=k
zd`TyJy~P91owAG$ymmS7@1sNqrF(07=Itttu~yVB6?&o8+|IaS!r=v796HrkeyK|B
zUTWu@;d*=0KH+(5e5M>!IewmP-@^&3{>-d@xz11CCuLb!%-`^5^B$#K@(W^X+7#*c
zdfTOaxyh=p=GXqZ{LKB^8%=&)@oq+z?6VhUO*@w&Da1Er|4j|YwVKwqq|OPt9{TyW
zzc*}seck`<aSlnT+q2e4_nXdbDsbd`G11}uw}L)nMXgsAr}V$hoM@@rz`ABvV`FIb
z>lJ>d4)~-Ncu2j7kg7Scz>a6pI+wi;<v0J#yTNLD&gJ5?xy+82m#74JtUAaVBbK(p
ze&^Yi)s?RIc^jJBi=XeFI(LS6Nyoj4)k{}w=x659-{zM!J2rZ6*@f~r#)qel{d%@d
z^!QiFn+MpAEjw-DIOBq>*q)S!d(JGlDlzZF-|4G&S((|FySOSa`<4c*-W_>c%3`rz
zS(lSz^6k6#k{Fp6`I#8K&-r}MH)Ge5fPe*VyM4a?TqGqN*vvF<>KcAC+1It_g~~Ip
zh@Sua_sg^R&%eJGd!{VlVS11;du7h~dg%=jrA+B@)s^>y-pehE+pcts`~Gj&mtl63
zTzGX_9VY8sPVSc4&Oe=7f@M+hYw05Q?Rx(2xAm>+>gtjbRh?2eb)u(aa@VvI{J%a5
z|1NLka$#j@IniVvXA@QWZtbq+S@xW^8jlMPoqDsSfFb>rWwhM1z_qdEuQq$^>P!+^
z8fxP*caQA)J(s6XHe1?vQgWZgqrfhO1vR>>r`|EYb*yXd3bn0bhVPZ4VhTT;=DeJ>
ze!e}^smaIE<=4NkUh(a|+LVfUv%f!F9Xf-ruK)Z~r6>~*Wufe+ihp`iZ?Y_X-R!c7
zQP(}_*x_?0w?BCBsDGE-L5Y=_&rZt3cS!m;WFB?*e7C;Rn5SlI+Pxo>=5O5oapj#|
zoEoc7JSu%TedanB%?n+(e_#9O{G0uUN00WEZvp<mjH_DW8c~vxSdwa$T$Bo=7>o=I
z4Rj3+bq$R|3@xk-46O`}bq#<F1HRc!swf(A^HVa@DsgM5KV~%(s6i5BLvVgtNqJ&X
lDuZK6ep0G}XKrG8YEWuoN@d~6R2!fo22WQ%mvv4FO#qs88A$*D

literal 0
HcmV?d00001

diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index 132e07d63..dbb8b09cb 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -35,16 +35,29 @@
                     android:layout_height="wrap_content"
                     android:visibility="gone"
                     />
-                <com.android.email.activity.AddressTextView
-                    android:id="@+id/to" android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="6dip"
-                    android:inputType="textEmailAddress|textMultiLine"
-                    android:imeOptions="actionNext"
-                    android:hint="@string/message_compose_to_hint" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <com.android.email.activity.AddressTextView
+                        android:id="@+id/to"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="?android:attr/textColorSecondary"
+                        android:layout_marginLeft="6dip"
+                        android:layout_marginRight="6dip"
+                        android:inputType="textEmailAddress|textMultiLine"
+                        android:imeOptions="actionNext"
+                        android:hint="@string/message_compose_to_hint" />
+                    <ImageView
+                        android:id="@+id/add_cc_bcc"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:src="@drawable/ic_menu_cc_holo_light" />
+                </LinearLayout>
                 <LinearLayout
                     android:id="@+id/cc_bcc_container"
                     android:layout_width="match_parent"
@@ -75,18 +88,30 @@
                         android:hint="@string/message_compose_bcc_hint"
                         />
                 </LinearLayout>
-                <EditText android:id="@+id/subject"
+                <LinearLayout
+                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="6dip"
-                    android:hint="@string/message_compose_subject_hint"
-                    android:inputType
-                        ="textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine"
-                    android:imeOptions="actionNext"
-                    />
+                    android:layout_height="wrap_content">
+
+                    <EditText android:id="@+id/subject"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="?android:attr/textColorSecondary"
+                        android:layout_marginLeft="6dip"
+                        android:layout_marginRight="6dip"
+                        android:hint="@string/message_compose_subject_hint"
+                        android:inputType
+                            ="textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine"
+                        android:imeOptions="actionNext"
+                        />
+                    <ImageView
+                        android:id="@+id/add_attachment"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:src="@drawable/ic_attachment_holo_light" />
+                </LinearLayout>
                 <!--
                     Empty container for storing attachments. We'll stick
                     instances of message_compose_attachment.xml in here.
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index 140abf738..5beb1ef85 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -30,16 +30,6 @@
         android:showAsAction="ifRoom"
         android:alphabeticShortcut="d"
     />
-    <item
-        android:id="@+id/add_cc_bcc"
-        android:title="@string/add_cc_bcc_action"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/add_attachment"
-        android:icon="@drawable/ic_attachment_holo_light"
-        android:showAsAction="ifRoom"
-    />
     <item
         android:id="@+id/discard"
         android:title="@string/discard_action"
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 9bd1d6aa8..0da3470ab 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -580,14 +580,11 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         mBccView.setTokenizer(new Rfc822Tokenizer());
         mBccView.setValidator(addressValidator);
 
-        final View addCcBccView = findViewById(R.id.add_cc_bcc); // xlarge only
-        if (addCcBccView != null) {
-            addCcBccView.setOnClickListener(this);
-        }
-        final View addAttachmentView = findViewById(R.id.add_attachment); // xlarge only
-        if (addAttachmentView != null) {
-            addAttachmentView.setOnClickListener(this);
-        }
+        final View addCcBccView = UiUtilities.getView(this, R.id.add_cc_bcc);
+        addCcBccView.setOnClickListener(this);
+
+        final View addAttachmentView = UiUtilities.getView(this, R.id.add_attachment);
+        addAttachmentView.setOnClickListener(this);
 
         setFocusShifter(R.id.to_label, R.id.to);
         setFocusShifter(R.id.cc_label, R.id.cc);