diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/conversation_message_attachment_bar.xml | 2 | ||||
| -rw-r--r-- | res/layout/conversation_message_footer.xml | 10 | ||||
| -rw-r--r-- | res/values-ldrtl/styles-ldrtl.xml | 10 | ||||
| -rw-r--r-- | res/values-sw600dp/constants.xml | 1 | ||||
| -rw-r--r-- | res/values-sw600dp/dimen.xml | 1 | ||||
| -rw-r--r-- | res/values/dimen.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | res/values/styles.xml | 10 |
8 files changed, 5 insertions, 36 deletions
diff --git a/res/layout/conversation_message_attachment_bar.xml b/res/layout/conversation_message_attachment_bar.xml index 2e7da428d..4fe12c0bd 100644 --- a/res/layout/conversation_message_attachment_bar.xml +++ b/res/layout/conversation_message_attachment_bar.xml @@ -18,7 +18,7 @@ <com.android.mail.browse.MessageAttachmentBar xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="8dip" + android:layout_marginBottom="12dp" android:background="@drawable/attachment_bg_holo" android:minHeight="48dip" > diff --git a/res/layout/conversation_message_footer.xml b/res/layout/conversation_message_footer.xml index 9d1d0394e..1e0c6d1c4 100644 --- a/res/layout/conversation_message_footer.xml +++ b/res/layout/conversation_message_footer.xml @@ -37,19 +37,11 @@ android:textSize="14sp" android:visibility="gone" /> - <TextView - android:id="@+id/attachments_header_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - android:text="@string/attachments_header" - android:visibility="gone" - 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:layout_marginBottom="12dp" android:visibility="gone" style="@style/AttachmentMarginStyle" /> diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml index d42fbce54..3bdab1280 100644 --- a/res/values-ldrtl/styles-ldrtl.xml +++ b/res/values-ldrtl/styles-ldrtl.xml @@ -27,10 +27,6 @@ <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_expanded</item> <item name="android:paddingEnd">@dimen/message_show_pics_header_padding_end</item> @@ -58,11 +54,6 @@ <item name="android:paddingEnd">@dimen/undo_text_padding</item> </style> - <style name="ConversationViewPaddingStyle"> - <item name="android:paddingStart">@dimen/conversation_view_margin_side</item> - <item name="android:paddingEnd">@dimen/conversation_view_margin_side</item> - </style> - <style name="MessageHeaderIconStyle"> <item name="android:layout_marginStart">@dimen/message_header_icon_additional_margin_start</item> </style> @@ -104,7 +95,6 @@ <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="AttachmentIconStyle"> diff --git a/res/values-sw600dp/constants.xml b/res/values-sw600dp/constants.xml index 228dcd685..fc2939962 100644 --- a/res/values-sw600dp/constants.xml +++ b/res/values-sw600dp/constants.xml @@ -19,7 +19,6 @@ <!-- Boolean value indicating whether the table UI should be used. --> <bool name="use_tablet_ui">true</bool> <integer name="conversation_header_mode">1</integer> - <integer name="conversation_desired_font_size_px">16</integer> <!-- Whether to show single or 2 pane search results --> <bool name="show_two_pane_search_results">false</bool> diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml index 3934ca91d..5d0fb6b13 100644 --- a/res/values-sw600dp/dimen.xml +++ b/res/values-sw600dp/dimen.xml @@ -36,6 +36,7 @@ Chose to make it larger by 20dp, half of the message_header_icon size. --> <dimen name="super_collapsed_stroke_margin_start">52dp</dimen> + <dimen name="attachment_margin_side">8dp</dimen> <dimen name="attachment_tile_min_size">180dp</dimen> <dimen name="attachment_tile_max_size">254dp</dimen> <dimen name="wait_padding">32dp</dimen> diff --git a/res/values/dimen.xml b/res/values/dimen.xml index 71fca72d7..4a1a34ae3 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -29,6 +29,7 @@ <dimen name="folders_text_bottom_padding">4dip</dimen> <dimen name="attachment_tile_min_size">120dp</dimen> <dimen name="attachment_tile_max_size">164dp</dimen> + <dimen name="attachment_tile_padding">12dp</dimen> <dimen name="compose_scrollview_max_width">768dp</dimen> <dimen name="color_block_width">32dip</dimen> <dimen name="color_block_height">6dip</dimen> @@ -51,7 +52,6 @@ <dimen name="conversation_folder_padding_after">8dp</dimen> <dimen name="folder_rounded_corner_radius">1dp</dimen> <dimen name="conversation_folder_margin_top">6dp</dimen> - <dimen name="message_details_header_padding_start">16dip</dimen> <dimen name="message_details_header_padding_start_expanded">72dip</dimen> <dimen name="message_details_header_padding_end">16dp</dimen> <dimen name="message_details_header_vertical_padding">7dp</dimen> @@ -122,7 +122,7 @@ <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_margin_side">0dp</dimen> <dimen name="attachment_icon_padding">5dip</dimen> <dimen name="recipient_summary_margin">16dip</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 01b762913..94071d86b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -244,9 +244,6 @@ <string name="saved">Saved, <xliff:g id="size">%s</xliff:g></string> <!-- Displayed in the conversation view. Status of a failed attachment. [CHAR LIMIT=50]--> <string name="download_failed">Couldn\'t download. Touch to retry.</string> - <!-- Displayed in the conversation view, as a header informing - the user that the following is the attachments. [CHAR LIMIT=100] --> - <string name="attachments_header">Attachments</string> <!-- Photo view screen, button name. Save all attachments to sd card. [CHAR LIMIT=17] --> <string name="menu_photo_save_all">Save all</string> <!-- Photo view screen, button name. Share attachment. [CHAR LIMIT=10] --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 2a7697439..87d53bf86 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -316,15 +316,6 @@ <item name="android:layout_marginLeft">@dimen/attachment_icon_padding</item> </style> - <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> @@ -661,7 +652,6 @@ <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="AttachmentIconStyle"> |