Update compose body.
Change-Id: I3fe44ae6a4593122a812163af7a10d09a3a63c7b
diff --git a/res/layout-sw600dp/compose_buttons.xml b/res/layout-sw600dp/compose_buttons.xml
index 6e47e10..b04594f 100644
--- a/res/layout-sw600dp/compose_buttons.xml
+++ b/res/layout-sw600dp/compose_buttons.xml
@@ -28,7 +28,7 @@
android:layout_weight="1" />
<Button android:id="@+id/add_cc_bcc"
- android:text="@string/plus_cc_label"
+ android:text="@string/add_cc_label"
style="@style/ComposeButton"
android:layout_marginLeft="16dip" />
diff --git a/res/layout/compose_body.xml b/res/layout/compose_body.xml
index 1389eae..735961c 100644
--- a/res/layout/compose_body.xml
+++ b/res/layout/compose_body.xml
@@ -20,13 +20,14 @@
android:layout_width="match_parent"
android:id="@+id/body_wrapper">
- <EditText android:id="@+id/body_text"
+ <EditText android:id="@+id/body"
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" />
+ android:imeOptions="flagNoFullscreen|actionDone|flagNoEnterAction"
+ android:textColorHint="@color/compose_label_text" />
</RelativeLayout>
\ No newline at end of file
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 483a23b..41c9e94 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -41,6 +41,7 @@
<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_scrollview_width">800dip</dimen>
<dimen name="compose_area_left_padding">100dip</dimen>
+ <dimen name="compose_area_right_padding">100dip</dimen>
</resources>
diff --git a/res/values-sw600dp/strings.xml b/res/values-sw600dp/strings.xml
index cc75342..4444c09 100644
--- a/res/values-sw600dp/strings.xml
+++ b/res/values-sw600dp/strings.xml
@@ -17,9 +17,9 @@
-->
<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>
+ <string name="add_cc_label">+ Cc/Bcc</string>
<!-- Compose screen, button: add bcc fields [CHAR LIMIT=20]-->
- <string name="plus_bcc_label">+ Bcc</string>
+ <string name="add_bcc_label">+ Bcc</string>
<!-- Menu item: options for this label. [CHAR LIMIT = 30] -->
<string name="menu_label_options">Manage labels</string>
</resources>