From 222c1151b1c11175dbdf30fad503f6caeb89e234 Mon Sep 17 00:00:00 2001
From: Mindy Pereira <mindyp@google.com>
Date: Mon, 30 Apr 2012 13:07:23 -0700
Subject: [PATCH] Fixup compose views.

Matches what I did for compose view 7" for gmail.

Change-Id: Ie7fc621ae6f6e0a50522fd6bd0f7296b14418e64
---
 res/layout-sw600dp/message_compose.xml               | 12 ++++++------
 res/values-sw600dp-land/dimensions.xml               |  3 +++
 res/values-sw600dp-port/dimensions.xml               |  2 ++
 res/values-sw600dp/dimensions.xml                    |  3 +++
 .../dimen.xml                                        |  1 +
 5 files changed, 15 insertions(+), 6 deletions(-)
 rename res/{values-sw720dp-land => values-sw720dp}/dimen.xml (95%)

diff --git a/res/layout-sw600dp/message_compose.xml b/res/layout-sw600dp/message_compose.xml
index 0a6dc6781..e662db591 100644
--- a/res/layout-sw600dp/message_compose.xml
+++ b/res/layout-sw600dp/message_compose.xml
@@ -31,7 +31,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                android:paddingLeft="100dip">
+                android:paddingLeft="@dimen/compose_area_left_padding">
 
                 <LinearLayout android:id="@+id/content"
                     android:orientation="horizontal"
@@ -50,9 +50,9 @@
                         <include layout="@layout/compose_area_recipients"/>
 
                     </LinearLayout>
-            
+
                     <include layout="@layout/compose_area_buttons"/>
-            
+
                 </LinearLayout>
 
                 <!--  Attachments -->
@@ -62,7 +62,7 @@
                     android:layout_marginTop="8dip"
                     android:orientation="vertical"
                     android:visibility="gone"
-                    android:layout_marginRight="100dip"
+                    android:layout_marginRight="@dimen/compose_area_right_padding"
                 >
                     <!--
                         Empty container for storing attachments. We'll stick
@@ -78,7 +78,7 @@
                 <!-- Compose Area -->
                 <FrameLayout android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="100dip">
+                    android:layout_marginRight="@dimen/compose_area_right_padding">
 
                     <include layout="@layout/compose_body"/>
 
@@ -86,7 +86,7 @@
 
                 <RelativeLayout android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="100dip">
+                    android:layout_marginRight="@dimen/compose_area_right_padding">
                     <include layout="@layout/quoted_text"/>
                 </RelativeLayout>
                 <FrameLayout
diff --git a/res/values-sw600dp-land/dimensions.xml b/res/values-sw600dp-land/dimensions.xml
index 12bda31d0..c164a6e10 100644
--- a/res/values-sw600dp-land/dimensions.xml
+++ b/res/values-sw600dp-land/dimensions.xml
@@ -36,4 +36,7 @@
     <dimen name="setup_padding_left">64dip</dimen>
     <dimen name="setup_padding_right">64dip</dimen>
 
+    <dimen name="compose_area_left_padding">100dip</dimen>
+    <dimen name="compose_area_right_padding">100dip</dimen>
+    <dimen name="compose_scrollview_width">800dip</dimen>
 </resources>
diff --git a/res/values-sw600dp-port/dimensions.xml b/res/values-sw600dp-port/dimensions.xml
index cb2d17c19..9fd281cab 100644
--- a/res/values-sw600dp-port/dimensions.xml
+++ b/res/values-sw600dp-port/dimensions.xml
@@ -38,4 +38,6 @@
     <dimen name="setup_padding_left">32dip</dimen>
     <dimen name="setup_padding_right">32dip</dimen>
 
+    <dimen name="compose_area_left_padding">76dip</dimen>
+    <dimen name="compose_area_right_padding">78dip</dimen>
 </resources>
diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml
index 24671b861..94362afd1 100644
--- a/res/values-sw600dp/dimensions.xml
+++ b/res/values-sw600dp/dimensions.xml
@@ -63,4 +63,7 @@
     <dimen name="replystate_margin_top">10sp</dimen>
     <dimen name="checkmark_margin_top">4sp</dimen>
     <dimen name="star_margin_top">30sp</dimen>
+
+
+    <dimen name="compose_scrollview_width">600dip</dimen>
 </resources>
diff --git a/res/values-sw720dp-land/dimen.xml b/res/values-sw720dp/dimen.xml
similarity index 95%
rename from res/values-sw720dp-land/dimen.xml
rename to res/values-sw720dp/dimen.xml
index 2e5554ef4..4cb726ca8 100644
--- a/res/values-sw720dp-land/dimen.xml
+++ b/res/values-sw720dp/dimen.xml
@@ -24,5 +24,6 @@
     <dimen name="mailbox_list_width">320dip</dimen>
     <!-- width of the message list, on the message list + message view mode. -->
     <dimen name="message_list_width">426dip</dimen>
+    <dimen name="compose_scrollview_width">700dip</dimen>
 </resources>