summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJin Cao <jinyan@google.com>2014-08-08 16:44:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-06 23:49:20 +0000
commita4b23e5b5ae6afd97b7241b73c2dbb6ceeacc58e (patch)
treebb72dfd885755323f1351bbcbf3643e1d52bb0b5 /res
parent542614ac73c1f69d6178ffcb878f39443bcfcab8 (diff)
parentf4a43119f89e3264ae7e6b2301d4886c329b852f (diff)
downloadandroid_packages_apps_UnifiedEmail-a4b23e5b5ae6afd97b7241b73c2dbb6ceeacc58e.tar.gz
android_packages_apps_UnifiedEmail-a4b23e5b5ae6afd97b7241b73c2dbb6ceeacc58e.tar.bz2
android_packages_apps_UnifiedEmail-a4b23e5b5ae6afd97b7241b73c2dbb6ceeacc58e.zip
Merge "[Quantum compose] support rtl/locale in compose" into ub-gmail-ur14-dev
Diffstat (limited to 'res')
-rw-r--r--res/values-ldrtl/styles-ldrtl.xml2
-rw-r--r--res/values/styles.xml5
2 files changed, 5 insertions, 2 deletions
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index d42fbce54..a611ca654 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -361,7 +361,7 @@
<item name="android:paddingEnd">@dimen/compose_attachment_tile_text_end_padding</item>
</style>
- <style name="ComposeFieldContent" >
+ <style name="ComposeFieldContent" parent="@style/ComposeFieldContentBase">
<item name="android:paddingStart">@dimen/compose_content_start_padding</item>
<item name="android:paddingEnd">@dimen/compose_content_end_padding</item>
</style>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ee704c7bd..27eacbd77 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -57,12 +57,14 @@
<item name="android:hint">@string/subject_hint</item>
<item name="android:imeOptions">actionDone|flagNoExtractUi|flagNoFullscreen</item>
<item name="android:inputType">textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine|textMultiLine</item>
+ <item name="android:textAlignment">viewStart</item>
<item name="android:textColorHint">@color/compose_label_hint</item>
</style>
<style name="ComposeBodyView" parent="@style/ComposeEditTextView">
<item name="android:imeOptions">flagNoFullscreen|actionDone|flagNoEnterAction</item>
<item name="android:inputType">textLongMessage|textMultiLine|textAutoCorrect|textCapSentences</item>
+ <item name="android:textAlignment">viewStart</item>
<item name="android:textColorHint">@color/compose_label_hint</item>
</style>
@@ -73,10 +75,11 @@
</style>
<style name="ComposeHeading">
- <item name="android:layout_width">56dp</item>
+ <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:gravity">center_vertical</item>
+ <item name="android:minWidth">56dp</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textColor">@color/compose_label_text</item>
<item name="android:textSize">@dimen/compose_header_text_size</item>