Separate RTL margins and paddings into ldrtl.
b/10751781
Change-Id: Ibc6d795c2899802eefb199f32081adc0a0b53e68
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5864484..8773834 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -175,11 +175,15 @@
<!-- End browse list item styles -->
<!-- Undo bar styles -->
- <style name="UndoTextStyle">
+ <style name="AbstractUndoTextStyle">
<item name="android:textSize">12sp</item>
<item name="android:textColor">#aaaaaa</item>
<item name="android:textStyle">bold</item>
</style>
+
+ <style name="UndoTextStyle" parent="AbstractUndoTextStyle">
+ <item name="android:paddingRight">@dimen/undo_text_padding</item>
+ </style>
<!-- End undo bar styles -->
<!-- Min time progress styles -->
@@ -196,12 +200,17 @@
<item name="android:windowContentOverlay">@null</item>
</style>
- <style name="ConversationSubjectStyle">
+ <style name="AbstractConversationSubjectStyle">
<item name="android:textSize">@dimen/conversation_header_font_size</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">@color/conv_header_text_dark</item>
</style>
+ <style name="ConversationSubjectStyle" parent="AbstractConversationSubjectStyle">
+ <item name="android:paddingLeft">@dimen/conversation_header_side_padding</item>
+ <item name="android:paddingRight">@dimen/conversation_header_side_padding</item>
+ </style>
+
<!-- Conversation view message header styles -->
<style name="MessageHeaderPresenceStyle">
<item name="android:layout_width">wrap_content</item>
@@ -236,19 +245,34 @@
<item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
</style>
- <style name="MessageHeaderShowPicsStyle" parent="MessageHeaderSmallStyle">
+ <style name="MessageHeaderDetailsHeadingStyle" parent="MessageHeaderSmallStyle">
+ <item name="android:layout_marginRight">@dimen/message_header_inner_side_padding</item>
+ </style>
+
+ <style name="AbstractMessageHeaderShowPicsStyle" parent="MessageHeaderSmallStyle">
<item name="android:textColor">@color/conv_header_text_light</item>
</style>
+ <style name="MessageHeaderShowPicsStyle" parent="AbstractMessageHeaderShowPicsStyle">
+ <item name="android:paddingLeft">@dimen/message_details_header_padding_start_collapsed
+ </item>
+ <item name="android:paddingRight">@dimen/message_show_pics_header_padding_end</item>
+ <item name="android:drawableLeft">@drawable/ic_show_images_holo_light</item>
+ </style>
+
<style name="MessageHeaderUpperDateStyle" parent="MessageHeaderSmallStyle">
<item name="android:minHeight">24dp</item>
</style>
- <style name="MessageAttachmentsHeaderStyle" parent="MessageHeaderSmallStyle">
+ <style name="AbstractMessageAttachmentsHeaderStyle" parent="MessageHeaderSmallStyle">
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">true</item>
</style>
+ <style name="MessageAttachmentsHeaderStyle" parent="AbstractMessageAttachmentsHeaderStyle">
+ <item name="android:paddingLeft">@dimen/message_details_header_padding_start</item>
+ </style>
+
<style name="MessageDetailsValueStyle" parent="MessageHeaderSmallStyle">
<item name="android:autoLink">email</item>
<item name="android:linksClickable">true</item>
@@ -464,10 +488,115 @@
<item name="android:textColor">?android:attr/textColorLink</item>
</style>
- <style name="NewMessageButtonStyle" parent="@android:style/Widget.Holo.Light.Button">
+ <style name="AbstractNewMessageButtonStyle" parent="@android:style/Widget.Holo.Light.Button">
<item name="android:background">@drawable/btn_default</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">@color/dark_gray_text_color</item>
<item name="android:textSize">14sp</item>
</style>
+
+ <style name="NewMessageButtonStyle" parent="AbstractNewMessageButtonStyle">
+ <item name="android:layout_marginLeft">@dimen/conversation_view_margin_side</item>
+ <item name="android:layout_marginRight">@dimen/conversation_view_margin_side</item>
+ </style>
+
+ <style name="DismissButtonStyle">
+ <item name="android:paddingLeft">@dimen/dismiss_button_padding_start</item>
+ <item name="android:paddingRight">@dimen/dismiss_button_padding_end</item>
+ </style>
+
+ <style name="MessageDetailsHeaderStyle">
+ <item name="android:paddingLeft">@dimen/message_details_header_padding_start_collapsed
+ </item>
+ <item name="android:paddingRight">@dimen/message_details_header_padding_end</item>
+ </style>
+
+ <style name="MessageUpperHeaderTextStyle">
+ <item name="android:paddingLeft">@dimen/message_header_inner_side_padding</item>
+ </style>
+
+ <style name="ConversationHeaderFolderStyle">
+ <item name="android:paddingLeft">@dimen/conversation_header_side_padding</item>
+ <item name="android:paddingRight">@dimen/conversation_header_side_padding</item>
+ </style>
+
+ <style name="CheckedTextStyle">
+ <item name="android:paddingLeft">@dimen/checked_text_padding</item>
+ <item name="android:paddingRight">@dimen/checked_text_padding</item>
+ </style>
+
+ <style name="SendMailStyle">
+ <item name="android:paddingRight">@dimen/send_mail_as_padding</item>
+ </style>
+
+ <style name="ConversationViewSideMarginStyle">
+ <item name="android:layout_marginLeft">@dimen/conversation_view_margin_side</item>
+ <item name="android:layout_marginRight">@dimen/conversation_view_margin_side</item>
+ </style>
+
+ <style name="ConversationViewSideMarginMinusGradientStyle">
+ <item name="android:layout_marginLeft">@dimen/conversation_view_margin_side_minus_gradient
+ </item>
+ <item name="android:layout_marginRight">@dimen/conversation_view_margin_side_minus_gradient
+ </item>
+ </style>
+
+ <style name="FolderListItemStartStyle">
+ <item name="android:layout_marginLeft">@dimen/folder_list_item_start_margin</item>
+ </style>
+
+ <style name="FolderListItemEndStyle">
+ <item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
+ </style>
+
+ <style name="FolderListItemStyle">
+ <item name="android:layout_marginLeft">@dimen/folder_list_item_start_margin</item>
+ <item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
+ </style>
+
+ <style name="DismissSeparatorStyle">
+ <item name="android:layout_marginLeft">@dimen/dismiss_separator_padding</item>
+ </style>
+
+ <style name="TeaserTextStyle">
+ <item name="android:layout_marginLeft">@dimen/teaser_text_padding</item>
+ </style>
+
+ <style name="DetailsExpanderStyle">
+ <item name="android:layout_marginLeft">@dimen/message_header_inner_side_padding</item>
+ </style>
+
+ <style name="AttachmentMarginStyle">
+ <item name="android:layout_marginLeft">@dimen/attachment_margin_side</item>
+ <item name="android:layout_marginRight">@dimen/attachment_margin_side</item>
+ </style>
+
+ <style name="MessageHeaderContactImageStyle">
+ <item name="android:layout_marginLeft">@dimen/message_header_padding_start</item>
+ </style>
+
+ <style name="AttachmentIconStyle">
+ <item name="android:layout_marginLeft">@dimen/attachment_icon_padding</item>
+ </style>
+
+ <style name="ConversationHeaderSideMarginStyle">
+ <item name="android:layout_marginLeft">@dimen/conversation_header_margin_side</item>
+ <item name="android:layout_marginRight">@dimen/conversation_header_margin_side</item>
+ </style>
+
+ <style name="UndoNotificationStyle">
+ <item name="android:layout_marginLeft">@android:dimen/notification_large_icon_width</item>
+ </style>
+
+ <style name="UnreadCountWithMarginEndStyle" parent="UnreadCount">
+ <item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
+ </style>
+
+ <style name="UnseenCountWithMarginEndStyle" parent="UnseenCount">
+ <item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
+ </style>
+
+ <style name="RecipientSummaryStyle" parent="MessageHeaderSmallStyle">
+ <item name="android:layout_marginRight">@dimen/recipient_summary_margin</item>
+ </style>
</resources>