Revert the CLs that updated the message headers.

Revert "Remove padding for message details. b/13329913."

This reverts commit 42c39c4026970508a536099085d5155196bbee42.

Revert "Fix UI issues caused by new attachment asset."

This reverts commit b6a6a5c2cd6d8b07e93c07b8a2cafa2276d9bec7.

Revert "Redesign of message headers. b/12933316."

This reverts commit 2ed8c0409cd7d8e64c58ada6f63a519517ddaf7d.

Revert "Ensure expanded details always shows. b/13348592."

This reverts commit bac524cc0575ff3cf54aa93247bf33c06edcdd9d.

Change-Id: I1d70329504dd788e4b2879137bae43eb4c4167fe

1 files changed, 30 insertions, 5 deletions

diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 70a0afe7f..59b3676c2 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -23,17 +23,18 @@
     </style>
 
     <style name="MessageDetailsHeaderStyle">
-        <item name="android:layout_marginStart">@dimen/message_details_header_margin_start</item>
-        <item name="android:paddingStart">@dimen/message_details_header_padding</item>
-        <item name="android:layout_marginEnd">@dimen/message_details_header_margin_end</item>
+        <item name="android:paddingStart">@dimen/message_details_header_padding_start_collapsed
+        </item>
+        <item name="android:paddingEnd">@dimen/message_details_header_padding_end</item>
     </style>
 
     <style name="MessageAttachmentsHeaderStyle" parent="AbstractMessageAttachmentsHeaderStyle">
-        <item name="android:paddingStart">@dimen/message_attachment_header_padding_start</item>
+        <item name="android:paddingStart">@dimen/message_details_header_padding_start</item>
     </style>
 
     <style name="MessageHeaderShowPicsStyle" parent="AbstractMessageHeaderShowPicsStyle">
-        <item name="android:paddingStart">@dimen/message_details_extra_content_padding_start</item>
+        <item name="android:paddingStart">@dimen/message_details_header_padding_start_collapsed
+        </item>
         <item name="android:paddingEnd">@dimen/message_show_pics_header_padding_end</item>
         <item name="android:drawableStart">@drawable/ic_show_images_holo_light</item>
     </style>
@@ -102,6 +103,10 @@
         <item name="android:layout_marginStart">@dimen/teaser_text_padding</item>
     </style>
 
+    <style name="DetailsExpanderStyle">
+        <item name="android:layout_marginStart">@dimen/message_header_inner_side_padding</item>
+    </style>
+
     <style name="MessageHeaderDetailsHeadingStyle" parent="MessageHeaderSmallStyle">
         <item name="android:layout_marginEnd">@dimen/message_header_inner_side_padding</item>
     </style>
@@ -115,6 +120,10 @@
         <item name="android:layout_marginStart">@dimen/message_header_padding_start</item>
     </style>
 
+    <style name="AttachmentIconStyle">
+        <item name="android:layout_marginStart">@dimen/attachment_icon_padding</item>
+    </style>
+
     <style name="ConversationHeaderSideMarginStyle">
         <item name="android:layout_marginStart">@dimen/conversation_header_margin_side</item>
         <item name="android:layout_marginEnd">@dimen/conversation_header_margin_side</item>
@@ -133,6 +142,10 @@
         <item name="android:layout_marginEnd">@dimen/folder_list_item_end_margin</item>
     </style>
 
+    <style name="RecipientSummaryStyle" parent="MessageHeaderSmallStyle">
+        <item name="android:layout_marginEnd">@dimen/recipient_summary_margin</item>
+    </style>
+
     <style name="AttachmentTextContainer">
         <item name="android:paddingStart">@dimen/compose_attachment_text_padding</item>
     </style>
@@ -217,6 +230,14 @@
         <item name="android:paddingEnd">@dimen/vacation_responder_inner_padding</item>
     </style>
 
+    <style name="MessageSenderNameStyle" parent="AbstractMessageSenderNameStyle">
+        <item name="android:layout_alignParentStart">true</item>
+    </style>
+
+    <style name="MessageHeaderSubtitleStyle" parent="AbstractMessageHeaderSubtitleStyle">
+        <item name="android:layout_alignParentStart">true</item>
+    </style>
+
     <style name="FolderColorBoxStyle" parent="AbstractFolderColorBoxStyle">
         <item name="android:layout_alignParentStart">true</item>
     </style>
@@ -226,6 +247,10 @@
         <item name="android:layout_alignParentStart">true</item>
     </style>
 
+    <style name="MessageHeaderUpperDateStyle" parent="AbstractMessageHeaderUpperDateStyle">
+        <item name="android:layout_alignParentEnd">true</item>
+    </style>
+
     <style name="FolderParentIconStyle">
         <item name="android:layout_alignParentEnd">true</item>
     </style>