From f23474a40d63340453a0cb2d99cb3dafa4b1b0ec Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Tue, 23 Nov 2010 10:33:07 -0800
Subject: [PATCH] Revive inputType and imeOptions for address and subject
 fields

Also removed an unnecessary android:text.

Bug 3222325

Change-Id: Iba49ee85569d7707a0927f44f363dbc9c6cc7c8a
---
 res/layout-xlarge/message_compose.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/res/layout-xlarge/message_compose.xml b/res/layout-xlarge/message_compose.xml
index 75641103e..57100ff7b 100644
--- a/res/layout-xlarge/message_compose.xml
+++ b/res/layout-xlarge/message_compose.xml
@@ -50,7 +50,6 @@
                 <TextView
                     android:id="@+id/from"
                     style="@style/message_compose_header_field_value"
-                    android:text="@string/message_compose_from_label"
                     />
             </LinearLayout>
 
@@ -65,6 +64,8 @@
                 <com.android.email.activity.AddressTextView
                     android:id="@+id/to"
                     style="@style/message_compose_header_field_value"
+                    android:inputType="textEmailAddress|textMultiLine"
+                    android:imeOptions="actionNext"
                     />
             </LinearLayout>
 
@@ -86,6 +87,8 @@
                     <com.android.email.activity.AddressTextView
                         android:id="@+id/cc"
                         style="@style/message_compose_header_field_value"
+                        android:inputType="textEmailAddress|textMultiLine"
+                        android:imeOptions="actionNext"
                         />
                 </LinearLayout>
 
@@ -100,6 +103,8 @@
                     <com.android.email.activity.AddressTextView
                         android:id="@+id/bcc"
                         style="@style/message_compose_header_field_value"
+                        android:inputType="textEmailAddress|textMultiLine"
+                        android:imeOptions="actionNext"
                         />
                 </LinearLayout>
             </LinearLayout>
@@ -115,6 +120,9 @@
                 <EditText
                     android:id="@+id/subject"
                     style="@style/message_compose_header_field_value"
+                    android:inputType
+                        ="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine"
+                    android:imeOptions="actionNext"
                     />
             </LinearLayout>