Merge "Separate RTL margins and paddings into ldrtl." into jb-ub-mail-ur10
diff --git a/res/layout/actionable_toast_row.xml b/res/layout/actionable_toast_row.xml
index c76d937..2f2a3df 100644
--- a/res/layout/actionable_toast_row.xml
+++ b/res/layout/actionable_toast_row.xml
@@ -68,7 +68,6 @@
android:layout_height="match_parent"
android:layout_marginLeft="4dip"
android:gravity="center_vertical"
- android:paddingRight="16dip"
android:textAllCaps="true" />
</LinearLayout>
diff --git a/res/layout/card_border.xml b/res/layout/card_border.xml
index 4adeb82..75a8bf0 100644
--- a/res/layout/card_border.xml
+++ b/res/layout/card_border.xml
@@ -25,11 +25,8 @@
android:id="@+id/card_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/conversation_view_margin_side"
- android:layout_marginLeft="@dimen/conversation_view_margin_side"
- android:layout_marginEnd="@dimen/conversation_view_margin_side"
- android:layout_marginRight="@dimen/conversation_view_margin_side"
- android:background="@drawable/card_bottom" />
+ android:background="@drawable/card_bottom"
+ style="@style/ConversationViewSideMarginStyle" />
<Space
android:id="@+id/border_space"
android:layout_width="match_parent"
@@ -38,9 +35,6 @@
android:id="@+id/card_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/conversation_view_margin_side"
- android:layout_marginLeft="@dimen/conversation_view_margin_side"
- android:layout_marginEnd="@dimen/conversation_view_margin_side"
- android:layout_marginRight="@dimen/conversation_view_margin_side"
- android:background="@drawable/card_top" />
+ android:background="@drawable/card_top"
+ style="@style/ConversationViewSideMarginStyle" />
</com.android.mail.browse.BorderView>
diff --git a/res/layout/child_folder_item.xml b/res/layout/child_folder_item.xml
index d7724ed..d1f3a53 100644
--- a/res/layout/child_folder_item.xml
+++ b/res/layout/child_folder_item.xml
@@ -41,9 +41,7 @@
<TextView
android:id="@+id/unread"
- style="@style/UnreadCount"
- android:layout_marginEnd="@dimen/folder_list_item_end_margin"
- android:layout_marginRight="@dimen/folder_list_item_end_margin"
+ style="@style/UnreadCountWithMarginEndStyle"
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentRight="true"
android:layout_toLeftOf="@id/folder_parent_icon"
@@ -51,9 +49,7 @@
<TextView
android:id="@+id/unseen"
- style="@style/UnseenCount"
- android:layout_marginEnd="@dimen/folder_list_item_end_margin"
- android:layout_marginRight="@dimen/folder_list_item_end_margin"
+ style="@style/UnseenCountWithMarginEndStyle"
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentRight="true"
android:layout_toLeftOf="@id/folder_parent_icon" />
@@ -64,10 +60,9 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/unread"
android:layout_alignWithParentIfMissing="true"
- android:layout_marginStart="@dimen/folder_list_item_start_margin"
- android:layout_marginLeft="@dimen/folder_list_item_start_margin"
android:layout_marginTop="@dimen/folder_swatch_height"
- android:layout_marginBottom="@dimen/folder_swatch_height">
+ android:layout_marginBottom="@dimen/folder_swatch_height"
+ style="@style/FolderListItemStartStyle" >
<ImageView
android:id="@+id/folder_icon"
diff --git a/res/layout/conversation_long_press_to_select_tip_view.xml b/res/layout/conversation_long_press_to_select_tip_view.xml
index 0e92ff0..4ee8fc6 100644
--- a/res/layout/conversation_long_press_to_select_tip_view.xml
+++ b/res/layout/conversation_long_press_to_select_tip_view.xml
@@ -20,14 +20,13 @@
android:layout_gravity="center_vertical"
android:layout_marginBottom="12dp"
android:layout_marginTop="12dp"
- android:layout_marginLeft="16dp"
- android:layout_marginStart="16dp"
android:layout_weight="1"
android:duplicateParentState="true"
android:fontFamily="sans-serif-light"
android:text="@string/long_press_to_select_tip"
android:textColor="@color/teaser_main_text"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ style="@style/TeaserTextStyle" />
<View
android:id="@+id/dismiss_separator"
@@ -36,8 +35,7 @@
android:background="@color/teaser_main_text"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:layout_marginLeft="16dp"
- android:layout_marginStart="16dp" />
+ style="@style/DismissSeparatorStyle" />
<ImageButton
android:id="@+id/dismiss_button"
@@ -45,13 +43,10 @@
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
- android:paddingLeft="20dip"
- android:paddingStart="20dip"
- android:paddingRight="28dip"
- android:paddingEnd="28dip"
android:scaleType="center"
android:contentDescription="@string/dismiss_tip_hover_text"
- android:src="@drawable/ic_cancel_holo_light" />
+ android:src="@drawable/ic_cancel_holo_light"
+ style="@style/DismissButtonStyle" />
<include layout="@layout/teaser_right_edge" />
</LinearLayout>
diff --git a/res/layout/conversation_message_details_header.xml b/res/layout/conversation_message_details_header.xml
index 935014e..0a4fad8 100644
--- a/res/layout/conversation_message_details_header.xml
+++ b/res/layout/conversation_message_details_header.xml
@@ -20,20 +20,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
- android:paddingStart="@dimen/message_details_header_padding_start_collapsed"
- android:paddingEnd="@dimen/message_details_header_padding_end"
- android:paddingLeft="@dimen/message_details_header_padding_start_collapsed"
- android:paddingRight="@dimen/message_details_header_padding_end"
- android:paddingBottom="@dimen/message_details_header_vertical_padding" >
+ android:paddingBottom="@dimen/message_details_header_vertical_padding"
+ style="@style/MessageDetailsHeaderStyle" >
<TextView
android:id="@+id/recipients_summary"
android:layout_width="0dp"
android:layout_gravity="fill_horizontal"
- android:layout_marginEnd="16dp"
- android:layout_marginRight="16dp"
android:singleLine="true"
android:bufferType="spannable"
- style="@style/MessageHeaderSmallStyle" />
+ style="@style/RecipientSummaryStyle" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/conversation_message_details_header_expanded.xml b/res/layout/conversation_message_details_header_expanded.xml
index f63cac6..94bc9dc 100644
--- a/res/layout/conversation_message_details_header_expanded.xml
+++ b/res/layout/conversation_message_details_header_expanded.xml
@@ -21,24 +21,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
- android:paddingStart="@dimen/message_details_header_padding_start_collapsed"
- android:paddingEnd="@dimen/message_details_header_padding_end"
- android:paddingLeft="@dimen/message_details_header_padding_start_collapsed"
- android:paddingRight="@dimen/message_details_header_padding_end"
app:columnCount="3"
- app:rowCount="6" >
+ app:rowCount="6"
+ style="@style/MessageDetailsHeaderStyle" >
<TextView
android:id="@+id/from_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/message_header_inner_side_padding"
- android:layout_marginRight="@dimen/message_header_inner_side_padding"
app:layout_column="0"
app:layout_row="0"
android:text="@string/from_heading"
android:visibility="gone"
- style="@style/MessageHeaderSmallStyle" />
+ style="@style/MessageHeaderDetailsHeadingStyle" />
<TextView
android:id="@+id/from_details"
android:layout_width="0dp"
@@ -53,23 +48,20 @@
android:id="@+id/details_expander"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/message_header_inner_side_padding"
- android:layout_marginLeft="@dimen/message_header_inner_side_padding"
app:layout_column="2"
app:layout_row="0"
android:contentDescription="@string/collapse_recipient_details"
- android:src="@drawable/ic_menu_expander_maximized_holo_light" />
+ android:src="@drawable/ic_menu_expander_maximized_holo_light"
+ style="@style/DetailsExpanderStyle" />
<TextView
android:id="@+id/replyto_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/message_header_inner_side_padding"
- android:layout_marginRight="@dimen/message_header_inner_side_padding"
app:layout_column="0"
app:layout_row="1"
android:text="@string/replyto_heading"
android:visibility="gone"
- style="@style/MessageHeaderSmallStyle" />
+ style="@style/MessageHeaderDetailsHeadingStyle" />
<TextView
android:id="@+id/replyto_details"
android:layout_width="0dp"
@@ -84,13 +76,11 @@
android:id="@+id/to_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/message_header_inner_side_padding"
- android:layout_marginRight="@dimen/message_header_inner_side_padding"
app:layout_column="0"
app:layout_row="2"
android:text="@string/to_heading"
android:visibility="gone"
- style="@style/MessageHeaderSmallStyle" />
+ style="@style/MessageHeaderDetailsHeadingStyle" />
<TextView
android:id="@+id/to_details"
android:layout_width="0dp"
@@ -105,13 +95,11 @@
android:id="@+id/cc_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/message_header_inner_side_padding"
- android:layout_marginRight="@dimen/message_header_inner_side_padding"
app:layout_column="0"
app:layout_row="3"
android:text="@string/cc_heading"
android:visibility="gone"
- style="@style/MessageHeaderSmallStyle" />
+ style="@style/MessageHeaderDetailsHeadingStyle" />
<TextView
android:id="@+id/cc_details"
android:layout_width="0dp"
@@ -126,13 +114,11 @@
android:id="@+id/bcc_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/message_header_inner_side_padding"
- android:layout_marginRight="@dimen/message_header_inner_side_padding"
app:layout_column="0"
app:layout_row="4"
android:text="@string/bcc_heading"
android:visibility="gone"
- style="@style/MessageHeaderSmallStyle" />
+ style="@style/MessageHeaderDetailsHeadingStyle" />
<TextView
android:id="@+id/bcc_details"
android:layout_width="0dp"
@@ -147,13 +133,11 @@
android:id="@+id/date_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/message_header_inner_side_padding"
- android:layout_marginRight="@dimen/message_header_inner_side_padding"
app:layout_column="0"
app:layout_row="5"
android:text="@string/date_heading"
android:visibility="gone"
- style="@style/MessageHeaderSmallStyle" />
+ style="@style/MessageHeaderDetailsHeadingStyle" />
<TextView
android:id="@+id/date_details"
android:layout_width="0dp"
diff --git a/res/layout/conversation_message_footer.xml b/res/layout/conversation_message_footer.xml
index 612d0c2..dc783b2 100644
--- a/res/layout/conversation_message_footer.xml
+++ b/res/layout/conversation_message_footer.xml
@@ -21,10 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:layout_marginStart="@dimen/conversation_view_margin_side"
- android:layout_marginEnd="@dimen/conversation_view_margin_side"
- android:layout_marginLeft="@dimen/conversation_view_margin_side"
- android:layout_marginRight="@dimen/conversation_view_margin_side" >
+ style="@style/ConversationViewSideMarginStyle" >
<TextView
android:id="@+id/attachments_header_text"
android:layout_width="wrap_content"
@@ -32,28 +29,20 @@
android:layout_marginBottom="16dp"
android:text="@string/attachments_header"
android:visibility="gone"
- android:paddingStart="@dimen/message_details_header_padding_start"
- android:paddingLeft="@dimen/message_details_header_padding_start"
- style="@style/MessageAttachmentsHeaderStyle"/>
+ style="@style/MessageAttachmentsHeaderStyle" />
<com.android.mail.ui.AttachmentTileGrid
android:id="@+id/attachment_tile_grid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
- android:layout_marginStart="16dp"
- android:layout_marginEnd="16dp"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"/>
+ style="@style/AttachmentMarginStyle" />
<LinearLayout
android:id="@+id/attachment_bar_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
- android:layout_marginStart="16dp"
- android:layout_marginEnd="16dp"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"
- android:orientation="vertical"/>
+ android:orientation="vertical"
+ style="@style/AttachmentMarginStyle" />
</com.android.mail.browse.MessageFooterView>
diff --git a/res/layout/conversation_message_header.xml b/res/layout/conversation_message_header.xml
index b4a9cbf..321ffc7 100644
--- a/res/layout/conversation_message_header.xml
+++ b/res/layout/conversation_message_header.xml
@@ -21,10 +21,7 @@
android:layout_height="wrap_content"
android:visibility="visible"
android:orientation="vertical"
- android:layout_marginStart="@dimen/conversation_view_margin_side"
- android:layout_marginEnd="@dimen/conversation_view_margin_side"
- android:layout_marginLeft="@dimen/conversation_view_margin_side"
- android:layout_marginRight="@dimen/conversation_view_margin_side" >
+ style="@style/ConversationViewSideMarginStyle" >
<include layout="@layout/conversation_message_upper_header"
android:id="@+id/upper_header" />
diff --git a/res/layout/conversation_message_show_pics.xml b/res/layout/conversation_message_show_pics.xml
index d59c519..4bf7bff 100644
--- a/res/layout/conversation_message_show_pics.xml
+++ b/res/layout/conversation_message_show_pics.xml
@@ -22,13 +22,7 @@
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:drawablePadding="10dp"
- android:drawableStart="@drawable/ic_show_images_holo_light"
- android:drawableLeft="@drawable/ic_show_images_holo_light"
android:paddingTop="@dimen/message_details_header_vertical_padding"
android:paddingBottom="@dimen/message_details_header_vertical_padding"
- android:paddingStart="@dimen/message_details_header_padding_start_collapsed"
- android:paddingLeft="@dimen/message_details_header_padding_start_collapsed"
- android:paddingEnd="14dp"
- android:paddingRight="14dp"
android:text="@string/show_images"
style="@style/MessageHeaderShowPicsStyle"/>
diff --git a/res/layout/conversation_message_upper_header.xml b/res/layout/conversation_message_upper_header.xml
index 3e9d2e8..efb800e 100644
--- a/res/layout/conversation_message_upper_header.xml
+++ b/res/layout/conversation_message_upper_header.xml
@@ -26,12 +26,11 @@
android:layout_width="@dimen/message_header_contact_photo_width"
android:layout_height="@dimen/message_header_contact_photo_height"
android:layout_gravity="center_vertical"
- android:layout_marginStart="@dimen/message_header_padding_start"
- android:layout_marginLeft="@dimen/message_header_padding_start"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:scaleType="centerCrop"
- android:contentDescription="@string/contact_info_string" />
+ android:contentDescription="@string/contact_info_string"
+ style="@style/MessageHeaderContactImageStyle" />
<!-- draft should match photo in dimensions -->
<ImageView
android:id="@+id/draft"
@@ -40,11 +39,10 @@
android:layout_gravity="center_vertical"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
- android:layout_marginStart="@dimen/message_header_padding_start"
- android:layout_marginLeft="@dimen/message_header_padding_start"
android:visibility="gone"
android:scaleType="center"
- android:src="@drawable/ic_draft" />
+ android:src="@drawable/ic_draft"
+ style="@style/MessageHeaderContactImageStyle" />
<include layout="@layout/conversation_message_upper_header_text" />
<include layout="@layout/conversation_message_upper_header_actions" />
diff --git a/res/layout/conversation_message_upper_header_text.xml b/res/layout/conversation_message_upper_header_text.xml
index f48f91e..e154152 100644
--- a/res/layout/conversation_message_upper_header_text.xml
+++ b/res/layout/conversation_message_upper_header_text.xml
@@ -25,8 +25,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="12dp"
- android:paddingStart="@dimen/message_header_inner_side_padding"
- android:paddingLeft="@dimen/message_header_inner_side_padding" >
+ style="@style/MessageUpperHeaderTextStyle" >
<TextView
android:id="@+id/upper_date"
@@ -43,11 +42,8 @@
android:layout_height="wrap_content"
android:layout_toStartOf="@id/upper_date"
android:layout_toLeftOf="@id/upper_date"
- android:layout_marginStart="5dp"
- android:layout_marginEnd="5dp"
- android:layout_marginLeft="5dp"
- android:layout_marginRight="5dp"
- android:src="@drawable/ic_attachment_holo_light" />
+ android:src="@drawable/ic_attachment_holo_light"
+ style="@style/AttachmentIconStyle" />
<TextView
android:id="@+id/sender_name"
android:layout_width="wrap_content"
diff --git a/res/layout/conversation_outbox_tip_view.xml b/res/layout/conversation_outbox_tip_view.xml
index 61bb6f6..8e66409 100644
--- a/res/layout/conversation_outbox_tip_view.xml
+++ b/res/layout/conversation_outbox_tip_view.xml
@@ -20,13 +20,12 @@
android:layout_gravity="center_vertical"
android:layout_marginBottom="12dp"
android:layout_marginTop="12dp"
- android:layout_marginLeft="16dp"
- android:layout_marginStart="16dp"
android:layout_weight="1"
android:duplicateParentState="true"
android:fontFamily="sans-serif-light"
android:textColor="@color/teaser_main_text"
- android:textSize="16sp" />
+ android:textSize="16sp"
+ style="@style/TeaserTextStyle" />
<View
android:id="@+id/dismiss_separator"
@@ -35,8 +34,7 @@
android:background="@color/teaser_main_text"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:layout_marginLeft="16dp"
- android:layout_marginStart="16dp" />
+ style="@style/DismissSeparatorStyle" />
<ImageButton
android:id="@+id/dismiss_button"
@@ -44,13 +42,10 @@
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
- android:paddingLeft="20dip"
- android:paddingStart="20dip"
- android:paddingRight="28dip"
- android:paddingEnd="28dip"
android:scaleType="center"
android:contentDescription="@string/dismiss_tip_hover_text"
- android:src="@drawable/ic_cancel_holo_light" />
+ android:src="@drawable/ic_cancel_holo_light"
+ style="@style/DismissButtonStyle" />
<include layout="@layout/teaser_right_edge" />
</LinearLayout>
diff --git a/res/layout/conversation_photo_teaser_view.xml b/res/layout/conversation_photo_teaser_view.xml
index 607c31d..22b19c9 100644
--- a/res/layout/conversation_photo_teaser_view.xml
+++ b/res/layout/conversation_photo_teaser_view.xml
@@ -53,13 +53,10 @@
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
- android:paddingLeft="20dip"
- android:paddingStart="20dip"
- android:paddingRight="28dip"
- android:paddingEnd="28dip"
android:scaleType="center"
android:contentDescription="@string/dismiss_tip_hover_text"
- android:src="@drawable/ic_cancel_holo_light" />
+ android:src="@drawable/ic_cancel_holo_light"
+ style="@style/DismissButtonStyle" />
<include layout="@layout/teaser_right_edge" />
</LinearLayout>
diff --git a/res/layout/conversation_sync_disabled_tip_view.xml b/res/layout/conversation_sync_disabled_tip_view.xml
index a361f1a..02de42c 100644
--- a/res/layout/conversation_sync_disabled_tip_view.xml
+++ b/res/layout/conversation_sync_disabled_tip_view.xml
@@ -48,8 +48,7 @@
android:background="@color/teaser_main_text"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:layout_marginLeft="16dp"
- android:layout_marginStart="16dp" />
+ style="@style/DismissSeparatorStyle" />
<ImageButton
android:id="@+id/dismiss_button"
@@ -57,13 +56,10 @@
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
- android:paddingLeft="20dip"
- android:paddingStart="20dip"
- android:paddingRight="28dip"
- android:paddingEnd="28dip"
android:scaleType="center"
android:contentDescription="@string/dismiss_tip_hover_text"
- android:src="@drawable/ic_cancel_holo_light" />
+ android:src="@drawable/ic_cancel_holo_light"
+ style="@style/DismissButtonStyle" />
<include layout="@layout/teaser_right_edge" />
</LinearLayout>
diff --git a/res/layout/conversation_view.xml b/res/layout/conversation_view.xml
index 8d6e628..69df078 100644
--- a/res/layout/conversation_view.xml
+++ b/res/layout/conversation_view.xml
@@ -28,10 +28,7 @@
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="@dimen/conversation_view_margin_side"
- android:layout_marginEnd="@dimen/conversation_view_margin_side"
- android:layout_marginLeft="@dimen/conversation_view_margin_side"
- android:layout_marginRight="@dimen/conversation_view_margin_side"
+ style="@style/ConversationViewSideMarginStyle"
android:scrollbars="none" />
<include layout="@layout/conversation_side_border_overlay"/>
@@ -49,10 +46,7 @@
android:id="@+id/snap_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/conversation_view_margin_side"
- android:layout_marginEnd="@dimen/conversation_view_margin_side"
- android:layout_marginLeft="@dimen/conversation_view_margin_side"
- android:layout_marginRight="@dimen/conversation_view_margin_side"
+ style="@style/ConversationViewSideMarginStyle"
android:layout_gravity="top"
android:visibility="gone" />
@@ -62,10 +56,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- android:layout_marginStart="@dimen/conversation_view_margin_side"
- android:layout_marginEnd="@dimen/conversation_view_margin_side"
- android:layout_marginLeft="@dimen/conversation_view_margin_side"
- android:layout_marginRight="@dimen/conversation_view_margin_side"
android:animateLayoutChanges="true"
android:paddingLeft="24dp"
android:paddingRight="24dp"
diff --git a/res/layout/conversation_view_header.xml b/res/layout/conversation_view_header.xml
index 673a8a5..1dbca3f 100644
--- a/res/layout/conversation_view_header.xml
+++ b/res/layout/conversation_view_header.xml
@@ -20,22 +20,15 @@
android:id="@+id/conversation_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/conversation_header_margin_side"
- android:layout_marginLeft="@dimen/conversation_header_margin_side"
- android:layout_marginEnd="@dimen/conversation_header_margin_side"
- android:layout_marginRight="@dimen/conversation_header_margin_side"
android:background="@android:color/white"
- android:orientation="vertical" >
+ android:orientation="vertical"
+ style="@style/ConversationHeaderSideMarginStyle" >
<TextView
android:id="@+id/subject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/conversation_header_vertical_padding"
- android:paddingLeft="@dimen/conversation_header_side_padding"
- android:paddingRight="@dimen/conversation_header_side_padding"
- android:paddingStart="@dimen/conversation_header_side_padding"
- android:paddingEnd="@dimen/conversation_header_side_padding"
android:includeFontPadding="false"
style="@style/ConversationSubjectStyle" />
@@ -48,8 +41,7 @@
android:gravity="right|end"
android:includeFontPadding="false"
android:lineSpacingExtra="4dp"
- android:paddingLeft="@dimen/conversation_header_side_padding"
- android:paddingStart="@dimen/conversation_header_side_padding"
- android:textSize="@dimen/conversation_folder_font_size" />
+ android:textSize="@dimen/conversation_folder_font_size"
+ style="@style/ConversationHeaderFolderStyle"/>
</com.android.mail.browse.ConversationViewHeader>
diff --git a/res/layout/custom_from_dropdown_item.xml b/res/layout/custom_from_dropdown_item.xml
index e11e569..684dadf 100644
--- a/res/layout/custom_from_dropdown_item.xml
+++ b/res/layout/custom_from_dropdown_item.xml
@@ -34,10 +34,9 @@
android:singleLine="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingRight="8dip"
- android:paddingEnd="8dip"
android:text="@string/custom_from_account_label"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ style="@style/SendMailStyle" />
<TextView
android:id="@+id/spinner_account_name"
diff --git a/res/layout/folder_item.xml b/res/layout/folder_item.xml
index 765ee82..0435fdd 100644
--- a/res/layout/folder_item.xml
+++ b/res/layout/folder_item.xml
@@ -45,11 +45,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_marginEnd="@dimen/folder_list_item_end_margin"
- android:layout_marginRight="@dimen/folder_list_item_end_margin"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
- android:duplicateParentState="true">
+ android:duplicateParentState="true"
+ style="@style/FolderListItemEndStyle" >
<TextView
android:id="@+id/unread"
@@ -67,12 +66,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_marginStart="@dimen/folder_list_item_start_margin"
- android:layout_marginLeft="@dimen/folder_list_item_start_margin"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:duplicateParentState="true"
- android:visibility="gone" />
+ android:visibility="gone"
+ style="@style/FolderListItemStartStyle" />
<TextView
android:id="@+id/name"
@@ -84,15 +82,12 @@
android:layout_toStartOf="@id/message_counts"
android:layout_toLeftOf="@id/message_counts"
android:layout_alignWithParentIfMissing="true"
- android:layout_marginStart="@dimen/folder_list_item_start_margin"
- android:layout_marginLeft="@dimen/folder_list_item_start_margin"
- android:layout_marginEnd="@dimen/folder_list_item_end_margin"
- android:layout_marginRight="@dimen/folder_list_item_end_margin"
android:duplicateParentState="true"
android:includeFontPadding="false"
android:maxLines="2"
android:ellipsize="end"
android:textColor="@color/folder_item_text_color"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ style="@style/FolderListItemStyle" />
</com.android.mail.ui.FolderItemView>
diff --git a/res/layout/secure_conversation_view.xml b/res/layout/secure_conversation_view.xml
index 2e391eb..f115a99 100644
--- a/res/layout/secure_conversation_view.xml
+++ b/res/layout/secure_conversation_view.xml
@@ -40,10 +40,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/conversation_view_margin_side_minus_gradient"
- android:layout_marginEnd="@dimen/conversation_view_margin_side_minus_gradient"
- android:layout_marginLeft="@dimen/conversation_view_margin_side_minus_gradient"
- android:layout_marginRight="@dimen/conversation_view_margin_side_minus_gradient"
+ style="@style/ConversationViewSideMarginMinusGradientStyle"
android:orientation="horizontal" >
<View
android:layout_width="1dp"
@@ -63,10 +60,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/conversation_view_margin_side_minus_gradient"
- android:layout_marginEnd="@dimen/conversation_view_margin_side_minus_gradient"
- android:layout_marginLeft="@dimen/conversation_view_margin_side_minus_gradient"
- android:layout_marginRight="@dimen/conversation_view_margin_side_minus_gradient"
+ style="@style/ConversationViewSideMarginMinusGradientStyle"
android:orientation="horizontal" >
<View
android:layout_width="1dp"
@@ -86,10 +80,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/conversation_view_margin_side_minus_gradient"
- android:layout_marginEnd="@dimen/conversation_view_margin_side_minus_gradient"
- android:layout_marginLeft="@dimen/conversation_view_margin_side_minus_gradient"
- android:layout_marginRight="@dimen/conversation_view_margin_side_minus_gradient"
+ style="@style/ConversationViewSideMarginMinusGradientStyle"
android:orientation="horizontal" >
<View
android:layout_width="1dp"
diff --git a/res/layout/select_dialog_multichoice_holo.xml b/res/layout/select_dialog_multichoice_holo.xml
index 3f2d818..6aa11e4 100644
--- a/res/layout/select_dialog_multichoice_holo.xml
+++ b/res/layout/select_dialog_multichoice_holo.xml
@@ -22,8 +22,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
- android:paddingStart="16dip"
- android:paddingEnd="16dip"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:ellipsize="marquee"
+ style="@style/CheckedTextStyle"
/>
\ No newline at end of file
diff --git a/res/layout/super_collapsed_block.xml b/res/layout/super_collapsed_block.xml
index e8211b7..138e976 100644
--- a/res/layout/super_collapsed_block.xml
+++ b/res/layout/super_collapsed_block.xml
@@ -20,10 +20,7 @@
android:id="@+id/super_collapsed_block"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/conversation_view_margin_side"
- android:layout_marginEnd="@dimen/conversation_view_margin_side"
- android:layout_marginLeft="@dimen/conversation_view_margin_side"
- android:layout_marginRight="@dimen/conversation_view_margin_side"
+ style="@style/ConversationViewSideMarginStyle"
android:background="@color/message_header_background_color" >
<TextView
android:id="@+id/super_collapsed_text"
diff --git a/res/layout/swipe_leavebehind_body.xml b/res/layout/swipe_leavebehind_body.xml
index 027d33c..82eef28 100644
--- a/res/layout/swipe_leavebehind_body.xml
+++ b/res/layout/swipe_leavebehind_body.xml
@@ -57,7 +57,6 @@
style="@style/UndoTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingRight="16dip"
android:text="@string/undo"
android:textAllCaps="true"
android:gravity="center_vertical"
diff --git a/res/layout/undo_notification.xml b/res/layout/undo_notification.xml
index 1e25cf8..86312ba 100644
--- a/res/layout/undo_notification.xml
+++ b/res/layout/undo_notification.xml
@@ -37,13 +37,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="fill_vertical"
- android:layout_marginLeft="@android:dimen/notification_large_icon_width"
- android:layout_marginStart="@android:dimen/notification_large_icon_width"
android:gravity="top"
android:minHeight="@android:dimen/notification_large_icon_height"
android:orientation="horizontal"
android:paddingBottom="2dp"
- android:paddingTop="2dp" >
+ android:paddingTop="2dp"
+ style="@style/UndoNotificationStyle" >
<TextView
android:id="@+id/description_text"
@@ -77,8 +76,6 @@
android:layout_height="match_parent"
android:layout_marginLeft="4dip"
android:gravity="center_vertical"
- android:paddingEnd="16dip"
- android:paddingRight="16dip"
android:text="@string/undo"
android:textAllCaps="true" />
</LinearLayout>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
new file mode 100644
index 0000000..5662f67
--- /dev/null
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 Google Inc.
+ Licensed to The Android Open Source Project.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <style name="DismissButtonStyle">
+ <item name="android:paddingStart">@dimen/dismiss_button_padding_start</item>
+ <item name="android:paddingEnd">@dimen/dismiss_button_padding_end</item>
+ </style>
+
+ <style name="MessageDetailsHeaderStyle">
+ <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_details_header_padding_start</item>
+ </style>
+
+ <style name="MessageHeaderShowPicsStyle" parent="AbstractMessageHeaderShowPicsStyle">
+ <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>
+
+ <style name="MessageUpperHeaderTextStyle">
+ <item name="android:paddingStart">@dimen/message_header_inner_side_padding</item>
+ </style>
+
+ <style name="ConversationSubjectStyle" parent="AbstractConversationSubjectStyle">
+ <item name="android:paddingStart">@dimen/conversation_header_side_padding</item>
+ <item name="android:paddingEnd">@dimen/conversation_header_side_padding</item>
+ </style>
+
+ <style name="ConversationHeaderFolderStyle">
+ <item name="android:paddingStart">@dimen/conversation_header_side_padding</item>
+ <item name="android:paddingEnd">@dimen/conversation_header_side_padding</item>
+ </style>
+
+ <style name="CheckedTextStyle">
+ <item name="android:paddingStart">@dimen/checked_text_padding</item>
+ <item name="android:paddingEnd">@dimen/checked_text_padding</item>
+ </style>
+
+ <style name="SendMailStyle">
+ <item name="android:paddingEnd">@dimen/send_mail_as_padding</item>
+ </style>
+
+ <style name="UndoTextStyle" parent="AbstractUndoTextStyle">
+ <item name="android:paddingEnd">@dimen/undo_text_padding</item>
+ </style>
+
+ <style name="ConversationViewSideMarginStyle">
+ <item name="android:layout_marginStart">@dimen/conversation_view_margin_side</item>
+ <item name="android:layout_marginEnd">@dimen/conversation_view_margin_side</item>
+ </style>
+
+ <style name="NewMessageButtonStyle" parent="AbstractNewMessageButtonStyle">
+ <item name="android:layout_marginStart">@dimen/conversation_view_margin_side</item>
+ <item name="android:layout_marginEnd">@dimen/conversation_view_margin_side</item>
+ </style>
+
+ <style name="ConversationViewSideMarginMinusGradientStyle">
+ <item name="android:layout_marginStart">@dimen/conversation_view_margin_side_minus_gradient
+ </item>
+ <item name="android:layout_marginEnd">@dimen/conversation_view_margin_side_minus_gradient
+ </item>
+ </style>
+
+ <style name="FolderListItemStartStyle">
+ <item name="android:layout_marginStart">@dimen/folder_list_item_start_margin</item>
+ </style>
+
+ <style name="DismissSeparatorStyle">
+ <item name="android:layout_marginStart">@dimen/dismiss_separator_padding</item>
+ </style>
+
+ <style name="TeaserTextStyle">
+ <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>
+
+ <style name="AttachmentMarginStyle">
+ <item name="android:layout_marginStart">@dimen/attachment_margin_side</item>
+ <item name="android:layout_marginEnd">@dimen/attachment_margin_side</item>
+ </style>
+
+ <style name="MessageHeaderContactImageStyle">
+ <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>
+ </style>
+
+ <style name="UndoNotificationStyle">
+ <item name="android:layout_marginStart">@android:dimen/notification_large_icon_width</item>
+ </style>
+
+ <style name="UnreadCountWithMarginEndStyle" parent="UnreadCount">
+ <item name="android:layout_marginEnd">@dimen/folder_list_item_end_margin</item>
+ </style>
+
+ <style name="UnseenCountWithMarginEndStyle" parent="UnseenCount">
+ <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>
+</resources>
\ No newline at end of file
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 4ee765a..9ad2a56 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -52,6 +52,7 @@
<dimen name="message_details_header_padding_start_collapsed">68dip</dimen>
<dimen name="message_details_header_padding_end">10dip</dimen>
<dimen name="message_details_header_vertical_padding">7dp</dimen>
+ <dimen name="message_show_pics_header_padding_end">14dip</dimen>
<dimen name="message_border_height">8dp</dimen>
<dimen name="message_border_height_collapsed">1dp</dimen>
<dimen name="message_header_presence_top_margin">-4dp</dimen>
@@ -115,4 +116,15 @@
<dimen name="ap_margin_side">4dp</dimen>
<dimen name="folder_minimum_width">48dip</dimen>
+
+ <dimen name="dismiss_button_padding_start">20dip</dimen>
+ <dimen name="dismiss_button_padding_end">28dip</dimen>
+ <dimen name="checked_text_padding">16dip</dimen>
+ <dimen name="send_mail_as_padding">8dip</dimen>
+ <dimen name="undo_text_padding">16dip</dimen>
+ <dimen name="dismiss_separator_padding">16dip</dimen>
+ <dimen name="teaser_text_padding">16dip</dimen>
+ <dimen name="attachment_margin_side">16dip</dimen>
+ <dimen name="attachment_icon_padding">5dip</dimen>
+ <dimen name="recipient_summary_margin">16dip</dimen>
</resources>
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>
diff --git a/src/com/android/mail/browse/ConversationViewHeader.java b/src/com/android/mail/browse/ConversationViewHeader.java
index 8248a80..5a4b66c 100644
--- a/src/com/android/mail/browse/ConversationViewHeader.java
+++ b/src/com/android/mail/browse/ConversationViewHeader.java
@@ -116,7 +116,7 @@
if (mLargeText && mSubjectView.getLineCount() > 2) {
mSubjectView.setTextSize(TypedValue.COMPLEX_UNIT_PX, mCondensedTextSize);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
// start, top, end, bottom
mSubjectView.setPaddingRelative(mSubjectView.getPaddingStart(),
mCondensedTopPadding, mSubjectView.getPaddingEnd(),