Merge "Fixup compose layouts." into jb-ub-mail
diff --git a/res/layout-sw600dp/compose.xml b/res/layout-sw600dp/compose.xml
index cfa9118..b618a84 100644
--- a/res/layout-sw600dp/compose.xml
+++ b/res/layout-sw600dp/compose.xml
@@ -34,7 +34,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"
@@ -65,7 +65,7 @@
android:orientation="vertical"
android:layout_marginTop="8dip"
android:paddingTop="2dip"
- android:layout_marginRight="100dip"
+ android:layout_marginRight="@dimen/compose_area_right_padding"
android:paddingBottom="0dip"
android:paddingLeft="0dip"
android:visibility="gone" />
@@ -73,7 +73,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"/>
diff --git a/res/layout/compose_body.xml b/res/layout/compose_body.xml
index 6f49419..1389eae 100644
--- a/res/layout/compose_body.xml
+++ b/res/layout/compose_body.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2011 Google Inc.
+ Copyright (C) 2012 Google Inc.
Licensed to The Android Open Source Project.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +16,17 @@
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/ComposeFieldLayout">
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:id="@+id/body_wrapper">
- <EditText android:id="@+id/body"
- style="@style/ComposeBodyStyle"
- android:hint="@string/body_hint"/>
+ <EditText android:id="@+id/body_text"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:hint="@string/body_hint"
+ android:minHeight="48dip"
+ android:gravity="top"
+ android:inputType="textLongMessage|textMultiLine|textAutoCorrect|textCapSentences"
+ android:imeOptions="flagNoFullscreen|actionDone|flagNoEnterAction" />
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values-sw600dp-port-v14/styles.xml b/res/values-sw600dp-port/dimen.xml
similarity index 76%
rename from res/values-sw600dp-port-v14/styles.xml
rename to res/values-sw600dp-port/dimen.xml
index 338b028..f751ec4 100644
--- a/res/values-sw600dp-port-v14/styles.xml
+++ b/res/values-sw600dp-port/dimen.xml
@@ -16,8 +16,7 @@
limitations under the License.
-->
<resources>
- <style name="unreadCountActionBarTablet" parent="@style/UnreadCountActionBar">
- <item name="android:layout_marginLeft">12dp</item>
- <item name="android:layout_width">wrap_content</item>
- </style>
+ <dimen name="compose_scrollview_width">600dip</dimen>
+ <dimen name="compose_area_left_padding">76dip</dimen>
+ <dimen name="compose_area_right_padding">78dip</dimen>
</resources>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
index af21f63..338b028 100644
--- a/res/values-sw600dp-port/styles.xml
+++ b/res/values-sw600dp-port/styles.xml
@@ -17,7 +17,7 @@
-->
<resources>
<style name="unreadCountActionBarTablet" parent="@style/UnreadCountActionBar">
- <item name="android:layout_width">0dip</item>
- <item name="android:layout_marginLeft">0dip</item>
+ <item name="android:layout_marginLeft">12dp</item>
+ <item name="android:layout_width">wrap_content</item>
</style>
</resources>
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 997a440..483a23b 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -41,4 +41,6 @@
<dimen name="message_header_action_button_width">56dip</dimen>
<dimen name="message_header_title_container_margin_right">0dip</dimen>
<dimen name="super_collapsed_height">32sp</dimen>
+ <dimen name="compose_scrollview_width">500dip</dimen>
+ <dimen name="compose_area_left_padding">100dip</dimen>
</resources>
diff --git a/res/values-sw600dp-port-v14/styles.xml b/res/values-sw600dp/strings.xml
similarity index 62%
copy from res/values-sw600dp-port-v14/styles.xml
copy to res/values-sw600dp/strings.xml
index 338b028..cc75342 100644
--- a/res/values-sw600dp-port-v14/styles.xml
+++ b/res/values-sw600dp/strings.xml
@@ -15,9 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<resources>
- <style name="unreadCountActionBarTablet" parent="@style/UnreadCountActionBar">
- <item name="android:layout_marginLeft">12dp</item>
- <item name="android:layout_width">wrap_content</item>
- </style>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Compose screen, button: add Cc/Bcc fields [CHAR LIMIT=20]-->
+ <string name="plus_cc_label">+ Cc/Bcc</string>
+ <!-- Compose screen, button: add bcc fields [CHAR LIMIT=20]-->
+ <string name="plus_bcc_label">+ Bcc</string>
+ <!-- Menu item: options for this label. [CHAR LIMIT = 30] -->
+ <string name="menu_label_options">Manage labels</string>
</resources>
diff --git a/res/values-sw720dp/dimen.xml b/res/values-sw720dp/dimen.xml
index 51a7acc..e549d9e 100644
--- a/res/values-sw720dp/dimen.xml
+++ b/res/values-sw720dp/dimen.xml
@@ -18,5 +18,6 @@
<resources>
<dimen name="compose_scrollview_width">700dip</dimen>
<dimen name="compose_area_left_padding">100dip</dimen>
+ <dimen name="compose_area_right_padding">100dip</dimen>
<dimen name="spinner_frame_width">260dip</dimen>
</resources>
\ No newline at end of file