diff options
| author | Jin Cao <jinyan@google.com> | 2014-07-30 00:21:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:37:54 +0000 |
| commit | 133cb86525952b025969512f50dbf346c1ea64b9 (patch) | |
| tree | 90379360a7dae161ffd451691c4a517c06515142 | |
| parent | e41bfda8711d7a283499d499e65824310d6ccd96 (diff) | |
| parent | 94bdc15af72b866e6b4f2da88a227e441da0bd87 (diff) | |
| download | android_packages_apps_UnifiedEmail-133cb86525952b025969512f50dbf346c1ea64b9.tar.gz android_packages_apps_UnifiedEmail-133cb86525952b025969512f50dbf346c1ea64b9.tar.bz2 android_packages_apps_UnifiedEmail-133cb86525952b025969512f50dbf346c1ea64b9.zip | |
Merge "Fix RTL style for compose" into ub-mail-master
| -rw-r--r-- | res/layout/cc_bcc_view.xml | 4 | ||||
| -rw-r--r-- | res/layout/compose_from.xml | 2 | ||||
| -rw-r--r-- | res/layout/compose_recipients.xml | 2 | ||||
| -rw-r--r-- | res/values-ldrtl/styles-ldrtl.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 10 |
5 files changed, 9 insertions, 15 deletions
diff --git a/res/layout/cc_bcc_view.xml b/res/layout/cc_bcc_view.xml index eefcf82a5..6f472a9f1 100644 --- a/res/layout/cc_bcc_view.xml +++ b/res/layout/cc_bcc_view.xml @@ -35,7 +35,7 @@ android:id="@+id/cc_label" android:contentDescription="@string/cc" android:text="@string/cc" - style="@style/RecipientComposeHeading" /> + style="@style/ComposeHeading" /> <com.android.ex.chips.RecipientEditTextView android:id="@+id/cc" @@ -64,7 +64,7 @@ android:id="@+id/bcc_label" android:contentDescription="@string/bcc" android:text="@string/bcc" - style="@style/RecipientComposeHeading" /> + style="@style/ComposeHeading" /> <com.android.ex.chips.RecipientEditTextView android:id="@+id/bcc" diff --git a/res/layout/compose_from.xml b/res/layout/compose_from.xml index 9157a4cb5..fc757150e 100644 --- a/res/layout/compose_from.xml +++ b/res/layout/compose_from.xml @@ -27,7 +27,7 @@ android:id="@+id/from_label" android:contentDescription="@string/from" android:text="@string/from" - style="@style/RecipientComposeHeading" /> + style="@style/ComposeHeading" /> <FrameLayout android:layout_width="0dp" diff --git a/res/layout/compose_recipients.xml b/res/layout/compose_recipients.xml index 99b9de0b9..c91cf1578 100644 --- a/res/layout/compose_recipients.xml +++ b/res/layout/compose_recipients.xml @@ -35,7 +35,7 @@ android:id="@+id/to_label" android:contentDescription="@string/to" android:text="@string/to" - style="@style/RecipientComposeHeading" /> + style="@style/ComposeHeading" /> <com.android.ex.chips.RecipientEditTextView android:id="@+id/to" diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml index 18e5e119f..6ed9f90a8 100644 --- a/res/values-ldrtl/styles-ldrtl.xml +++ b/res/values-ldrtl/styles-ldrtl.xml @@ -244,10 +244,6 @@ <item name="android:layout_marginEnd">@dimen/message_attachment_bar_padding</item> </style> - <style name="RecipientComposeHeading" parent="@style/ComposeHeading"> - <item name="android:paddingStart">0dip</item> - </style> - <style name="WidgetSendersStyle"> <item name="android:paddingEnd">@dimen/widget_senders_padding_end</item> </style> @@ -377,7 +373,7 @@ <item name="android:paddingStart">@dimen/custom_from_inner_padding</item> </style> - <style name="AbstractComposeArea"> + <style name="ComposeArea" parent="@style/AbstractComposeArea"> <item name="android:paddingStart">@dimen/compose_area_start_padding</item> <item name="android:paddingEnd">@dimen/compose_area_end_padding</item> </style> diff --git a/res/values/styles.xml b/res/values/styles.xml index ba9508b7c..9120dbfd8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -68,14 +68,11 @@ <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:textAlignment">viewStart</item> <item name="android:textColor">@color/compose_label_text</item> <item name="android:textSize">@dimen/compose_header_text_size</item> </style> - <style name="RecipientComposeHeading" parent="@style/ComposeHeading"> - <item name="android:paddingLeft">0dp</item> - </style> - <style name="ComposeFieldLayoutBase" /> <style name="ComposeFieldLayout" parent="@style/ComposeFieldLayoutBase"> @@ -987,12 +984,13 @@ <item name="android:layout_gravity">center_horizontal</item> <item name="android:animateLayoutChanges">true</item> <item name="android:background">@android:color/white</item> + </style> + + <style name="ComposeArea" parent="AbstractComposeArea"> <item name="android:paddingLeft">@dimen/compose_area_start_padding</item> <item name="android:paddingRight">@dimen/compose_area_end_padding</item> </style> - <style name="ComposeArea" parent="AbstractComposeArea" /> - <style name="ComposeAreaWrapper"> <item name="android:layout_gravity">center_horizontal</item> <item name="android:paddingLeft">@dimen/compose_wrapper_side_padding</item> |