From 17b261421c10565aca33e0c167f78c532cf6af2d Mon Sep 17 00:00:00 2001
From: Mindy Pereira <mindyp@google.com>
Date: Mon, 26 Sep 2011 09:49:23 -0700
Subject: [PATCH] Fixup the styles for chips fields.

Change-Id: I579b2beafc753f7aea8af4bc4bdd6360ef074744
---
 res/layout-sw600dp-v14/compose_subject.xml |  4 +-
 res/layout-v14/compose_subject.xml         |  8 +--
 res/layout-v14/message_compose_body.xml    |  4 +-
 res/layout-v14/recipients_area.xml         | 60 ++++++++++++++--------
 res/values-land-v14/styles.xml             | 34 +++++++++---
 res/values-v13/styles.xml                  |  9 ----
 res/values/styles.xml                      | 35 +++++++++++--
 7 files changed, 105 insertions(+), 49 deletions(-)

diff --git a/res/layout-sw600dp-v14/compose_subject.xml b/res/layout-sw600dp-v14/compose_subject.xml
index fd1f5750d..d72bd317c 100644
--- a/res/layout-sw600dp-v14/compose_subject.xml
+++ b/res/layout-sw600dp-v14/compose_subject.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/RecipientComposeFieldLayout">
+    style="@style/ComposeFieldLayout">
     <TextView
         android:id="@+id/subject_label"
         style="@style/RecipientComposeHeading"
@@ -22,7 +22,7 @@
         />
     <EditText
         android:id="@+id/subject"
-        style="@style/ChipsComposeSubjectStyle"
+        style="@style/EmailRecipientEditTextView"
         android:inputType
             ="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine"
         android:imeOptions="actionNext"
diff --git a/res/layout-v14/compose_subject.xml b/res/layout-v14/compose_subject.xml
index a4b214398..a5b5d4d8f 100644
--- a/res/layout-v14/compose_subject.xml
+++ b/res/layout-v14/compose_subject.xml
@@ -13,11 +13,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/RecipientComposeFieldLayout">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/ComposeFieldLayout">
     <EditText android:id="@+id/subject"
-        style="@style/EmailRecipientEditTextView"
+        style="@style/EmailComposeEditTextView"
         android:hint="@string/message_compose_subject_hint"
         android:textColorHint="@color/compose_label_text"
         />
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-v14/message_compose_body.xml b/res/layout-v14/message_compose_body.xml
index 5864cc2dc..726964b56 100644
--- a/res/layout-v14/message_compose_body.xml
+++ b/res/layout-v14/message_compose_body.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/RecipientComposeFieldLayout">
+    style="@style/ComposeFieldLayout">
 
     <EditText android:id="@+id/message_content"
-        style="@style/ChipsComposeBodyStyle"
+        style="@style/LargeComposeAreaBody"
         />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v14/recipients_area.xml b/res/layout-v14/recipients_area.xml
index e46ec2e94..56dc65245 100644
--- a/res/layout-v14/recipients_area.xml
+++ b/res/layout-v14/recipients_area.xml
@@ -26,15 +26,23 @@ automatically saved by framework.-->
         android:layout_width="match_parent"
         android:id="@+id/to_content">
 
-        <TextView style="@style/RecipientComposeHeading"
-            android:text="@string/message_compose_to_hint"
-            android:id="@+id/label"/>
+        <LinearLayout android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:addStatesFromChildren="true"
+            android:gravity="center_vertical"
+            android:layout_gravity="center_vertical">
+            <TextView style="@style/RecipientComposeHeading"
+                android:text="@string/message_compose_to_hint"
+                android:id="@+id/label"/>
 
-        <com.android.email.activity.ChipsAddressTextView
-            style="@style/EmailRecipientEditTextView"
-            android:id="@+id/to" />
+            <com.android.email.activity.ChipsAddressTextView
+                style="@style/EmailRecipientEditTextView"
+                android:id="@+id/to" />
+        </LinearLayout>
 
+        <View style="@style/RecipientComposeFieldSpacer"/>
     </LinearLayout>
+
     <LinearLayout
         android:layout_below="@id/to_content"
         android:id="@+id/cc_bcc_container"
@@ -47,30 +55,42 @@ automatically saved by framework.-->
             style="@style/RecipientComposeFieldLayout"
             android:layout_alignParentTop="true"
             android:id="@+id/cc_content">
+            <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:addStatesFromChildren="true"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical">
+                <TextView style="@style/RecipientComposeHeading"
+                    android:text="@string/message_compose_to_hint"
+                    android:id="@+id/label"/>
 
-            <TextView style="@style/RecipientComposeHeading"
-                android:text="@string/message_compose_to_hint"
-                android:id="@+id/label"/>
-
-            <com.android.email.activity.ChipsAddressTextView
-                style="@style/EmailRecipientEditTextView"
-                android:id="@+id/cc" />
+                <com.android.email.activity.ChipsAddressTextView
+                    style="@style/EmailRecipientEditTextView"
+                    android:id="@+id/cc" />
+            </LinearLayout>
 
+            <View style="@style/RecipientComposeFieldSpacer"/>
         </LinearLayout>
 
         <LinearLayout
             style="@style/RecipientComposeFieldLayout"
             android:layout_alignParentTop="true"
             android:id="@+id/bcc_content">
+            <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:addStatesFromChildren="true"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical">
+                <TextView style="@style/RecipientComposeHeading"
+                    android:text="@string/message_compose_to_hint"
+                    android:id="@+id/label"/>
 
-            <TextView style="@style/RecipientComposeHeading"
-                android:text="@string/message_compose_to_hint"
-                android:id="@+id/label"/>
-
-            <com.android.email.activity.ChipsAddressTextView
-                style="@style/EmailRecipientEditTextView"
-                android:id="@+id/bcc" />
+                <com.android.email.activity.ChipsAddressTextView
+                    style="@style/EmailRecipientEditTextView"
+                    android:id="@+id/bcc" />
+            </LinearLayout>
 
+            <View style="@style/RecipientComposeFieldSpacer"/>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/res/values-land-v14/styles.xml b/res/values-land-v14/styles.xml
index 1c28361cd..832a2c57e 100644
--- a/res/values-land-v14/styles.xml
+++ b/res/values-land-v14/styles.xml
@@ -14,23 +14,43 @@
      limitations under the License.
 -->
 <resources>
-    <style name="RecipientComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
+    <style name="RecipientComposeHeading">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">@color/compose_label_text</item>
+        <item name="android:layout_marginRight">4dip</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:layout_marginTop">2dip</item>
+     </style>
+
+    <style name="ComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:addStatesFromChildren">true</item>
         <item name="android:focusable">false</item>
         <item name="android:focusableInTouchMode">false</item>
-        <item name="android:gravity">bottom</item>
-        <item name="android:minHeight">48dip</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:minHeight">38dip</item>
+        <item name="android:paddingTop">0dip</item>
     </style>
 
     <style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
-        <item name="android:minHeight">0dip</item>
+        <item name="android:minHeight">36dip</item>
+        <item name="android:gravity">bottom</item>
     </style>
 
-    <style name="ChipsComposeBodyStyle" parent="@style/ComposeBodyStyle">
+    <style name="LargeComposeAreaBody" parent="@style/ComposeBodyStyle" >
+        <item name="android:background">@null</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:minHeight">38dip</item>
+    </style>
+
+    <style name="EmailComposeEditTextView">
+        <item name="android:minHeight">40dip</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:background">@null</item>
-        <item name="android:gravity">bottom</item>
-        <item name="android:minHeight">0dip</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/res/values-v13/styles.xml b/res/values-v13/styles.xml
index 961af2d94..e4a176774 100644
--- a/res/values-v13/styles.xml
+++ b/res/values-v13/styles.xml
@@ -18,13 +18,4 @@
 <resources>
     <style name="EmailTheme" parent="@android:style/Theme.Holo.Light">
     </style>
-    <style name="ChipsComposeBodyStyle" parent="@style/ComposeBodyStyle">
-        <item name="android:background">@null</item>
-        <item name="android:minHeight">42dip</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-    <style name="ChipsComposeSubjectStyle" parent="@style/ComposeSubjectStyle">
-        <item name="android:background">@null</item>
-        <item name="android:minHeight">0dip</item>
-    </style>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fbc9857da..47d0b25bc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -216,7 +216,26 @@
 
     <style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
         <item name="android:minHeight">42dip</item>
-        <item name="android:gravity">center_vertical</item>
+        <item name="android:gravity">bottom</item>
+    </style>
+
+    <style name="EmailComposeEditTextView">
+        <item name="android:minHeight">44dip</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:background">@null</item>
+    </style>
+
+    <style name="LargeComposeAreaBody" parent="@style/ComposeBodyStyle" >
+        <item name="android:background">@null</item>
+        <item name="android:minHeight">42dip</item>
+        <item name="android:layout_gravity">center_vertical</item>
+    </style>
+
+    <style name="RecipientComposeFieldSpacer">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">4dip</item>
     </style>
 
     <style name="ComposeFieldLinearLayout" parent="android:Widget.Holo.Light.EditText">
@@ -245,18 +264,24 @@
         <item name="android:textSize">18sp</item>
         <item name="android:textColor">@color/compose_label_text</item>
         <item name="android:layout_marginRight">4dip</item>
+        <item name="android:layout_marginTop">4dip</item>
+        <item name="android:layout_gravity">center_vertical</item>
      </style>
 
-    <style name="RecipientComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
+    <style name="ComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:addStatesFromChildren">true</item>
         <item name="android:focusable">false</item>
         <item name="android:focusableInTouchMode">false</item>
-        <item name="android:gravity">center</item>
-        <item name="android:minHeight">48dip</item>
-        <item name="android:paddingTop">4dip</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:paddingTop">0dip</item>
     </style>
+
+    <style name="RecipientComposeFieldLayout" parent="@style/ComposeFieldLayout">
+        <item name="android:orientation">vertical</item>
+    </style>
+
     <style name="ComposeBodyStyle">
         <item name="android:minHeight">48dip</item>
         <item name="android:layout_height">wrap_content</item>