RTL - tablet compose UI. Fixes b/10413153.
Change-Id: I2ead2c64a7451e985f34b8bda210aa7dec3e8275
diff --git a/res/layout-sw600dp/compose.xml b/res/layout-sw600dp/compose.xml
index cf66774..44fa5cb 100644
--- a/res/layout-sw600dp/compose.xml
+++ b/res/layout-sw600dp/compose.xml
@@ -38,12 +38,11 @@
android:paddingTop="8dip"
android:background="@android:color/white"
android:layout_gravity="center_horizontal"
- android:paddingLeft="@dimen/compose_area_left_padding"
android:animateLayoutChanges="true">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<FrameLayout
style="@style/FillRowStyle">
<include layout="@layout/compose_from"/>
@@ -77,16 +76,17 @@
<View style="@style/RecipientComposeFieldSpacer"/>
</LinearLayout>
<RelativeLayout
- android:layout_width="@dimen/compose_area_right_padding"
+ android:layout_width="@dimen/compose_area_end_padding"
android:layout_height="wrap_content"
android:layout_column="2"
- android:layout_gravity="bottom|left"
- android:gravity="bottom|left">
+ android:layout_gravity="bottom|left|start"
+ android:gravity="bottom|left|start">
<Button android:id="@+id/add_cc_bcc"
android:text="@string/add_cc_label"
style="@style/ComposeButton"
android:layout_marginBottom="6dip"
android:paddingLeft="8dip"
+ android:paddingRight="8dip"
android:focusable="true"
android:clickable="true"/>
</RelativeLayout>
@@ -94,7 +94,7 @@
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<com.android.mail.compose.CcBccView
android:id="@+id/cc_bcc_wrapper"
style="@style/FillRowStyle"/>
@@ -108,7 +108,8 @@
android:layout_column="1"
android:layout_weight="1"
android:layout_width="0dip">
- <!-- Subject: localization cannot control what field pressing tab will bring the user to. This is controlled at runtime. -->
+ <!-- Subject: localization cannot control what field
+ pressing tab will bring the user to. This is controlled at runtime. -->
<com.android.mail.compose.EnterSubject android:id="@+id/subject"
style="@style/ComposeSubjectView" />
</RelativeLayout>
@@ -123,13 +124,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="4dip"
+ android:paddingRight="4dip"
android:clickable="false"/>
</RelativeLayout>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<!-- Compose Area -->
<FrameLayout
android:id="@+id/compose_wrapper"
@@ -140,7 +142,7 @@
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<!-- Attachments -->
<com.android.mail.compose.AttachmentsView android:id="@+id/attachments"
android:orientation="vertical"
@@ -148,7 +150,6 @@
android:animateLayoutChanges="true"
android:paddingTop="2dip"
android:paddingBottom="0dip"
- android:paddingLeft="0dip"
android:visibility="gone"
style="@style/FillRowStyle">
<include layout="@layout/compose_attachments" />
@@ -157,7 +158,7 @@
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<!-- Quoted text -->
<com.android.mail.compose.QuotedTextView android:id="@+id/quoted_text_view"
android:layout_height="wrap_content"
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index e4d28b0..2f279d7 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -263,6 +263,7 @@
</style>
<style name="RecipientComposeHeading" parent="@style/AbstractRecipientComposeHeading">
+ <item name="android:paddingStart">0dip</item>
<item name="android:layout_marginEnd">@dimen/compose_recipient_heading_margin_end</item>
</style>
@@ -381,4 +382,11 @@
<item name="android:paddingStart">@dimen/custom_from_inner_padding</item>
</style>
+ <style name="AbstractComposeArea">
+ <item name="android:paddingStart">@dimen/compose_area_start_padding</item>
+ </style>
+
+ <style name="ComposeRowStyle">
+ <item name="android:paddingEnd">@dimen/compose_area_end_padding</item>
+ </style>
</resources>
diff --git a/res/values-sw600dp-land/dimen.xml b/res/values-sw600dp-land/dimen.xml
index 6471b1c..6e4a066 100644
--- a/res/values-sw600dp-land/dimen.xml
+++ b/res/values-sw600dp-land/dimen.xml
@@ -17,8 +17,8 @@
-->
<resources>
<dimen name="compose_scrollview_width">800dip</dimen>
- <dimen name="compose_area_left_padding">100dip</dimen>
- <dimen name="compose_area_right_padding">100dip</dimen>
+ <dimen name="compose_area_start_padding">100dip</dimen>
+ <dimen name="compose_area_end_padding">100dip</dimen>
<dimen name="search_view_width">500dip</dimen>
<dimen name="spinner_frame_width">196dp</dimen>
</resources>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 14958c0..a3574db 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<resources>
- <style name="ComposeArea">
+ <style name="ComposeArea" parent="AbstractComposeArea">
<item name="android:layout_width">@dimen/compose_scrollview_width</item>
</style>
</resources>
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 3e316bc..024e700 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -40,8 +40,8 @@
<dimen name="attachment_tile_max_size">254dp</dimen>
<dimen name="wait_padding">32dp</dimen>
- <dimen name="compose_area_left_padding">80dip</dimen>
- <dimen name="compose_area_right_padding">80dip</dimen>
+ <dimen name="compose_area_start_padding">80dip</dimen>
+ <dimen name="compose_area_end_padding">80dip</dimen>
<dimen name="search_view_width">400dip</dimen>
<dimen name="spinner_frame_width">170dp</dimen>
</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 2ff5eb3..c0bc401 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -23,7 +23,7 @@
<item name="android:layout_width">@dimen/spinner_frame_width</item>
</style>
- <style name="ComposeArea">
+ <style name="ComposeArea" parent="AbstractComposeArea">
<item name="android:layout_width">match_parent</item>
</style>
diff --git a/res/values-sw800dp-land/dimen.xml b/res/values-sw800dp-land/dimen.xml
index 749da16..29544f9 100644
--- a/res/values-sw800dp-land/dimen.xml
+++ b/res/values-sw800dp-land/dimen.xml
@@ -18,6 +18,6 @@
<resources>
<!--Manta b/7382467-->
<dimen name="compose_scrollview_width">848dip</dimen>
- <dimen name="compose_area_left_padding">104dip</dimen>
- <dimen name="compose_area_right_padding">104dip</dimen>
+ <dimen name="compose_area_start_padding">104dip</dimen>
+ <dimen name="compose_area_end_padding">104dip</dimen>
</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e5de1a6..35f6098 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -60,10 +60,10 @@
<style name="AbstractRecipientComposeHeading" parent="@style/ComposeHeading">
<item name="android:layout_marginTop">4dip</item>
- <item name="android:paddingLeft">0dip</item>
</style>
<style name="RecipientComposeHeading" parent="@style/AbstractRecipientComposeHeading">
+ <item name="android:paddingLeft">0dip</item>
<item name="android:layout_marginRight">@dimen/compose_recipient_heading_margin_end</item>
</style>
@@ -462,8 +462,8 @@
<item name="android:layout_height">48dip</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:addStatesFromChildren">true</item>
- <item name="android:gravity">center|left</item>
- <item name="android:layout_gravity">center|left</item>
+ <item name="android:gravity">center|left|start</item>
+ <item name="android:layout_gravity">center|left|start</item>
</style>
<style name="FillRowStyle">
@@ -924,4 +924,11 @@
<item name="android:paddingLeft">@dimen/custom_from_inner_padding</item>
</style>
+ <style name="AbstractComposeArea">
+ <item name="android:paddingLeft">@dimen/compose_area_start_padding</item>
+ </style>
+
+ <style name="ComposeRowStyle">
+ <item name="android:paddingRight">@dimen/compose_area_end_padding</item>
+ </style>
</resources>
