diff options
| -rw-r--r-- | res/layout/attachment.xml | 30 | ||||
| -rw-r--r-- | res/layout/compose_attachment_tile.xml | 1 | ||||
| -rw-r--r-- | res/values-ldrtl/styles-ldrtl.xml | 4 | ||||
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/dimen.xml | 1 | ||||
| -rw-r--r-- | res/values/styles.xml | 37 |
6 files changed, 36 insertions, 38 deletions
diff --git a/res/layout/attachment.xml b/res/layout/attachment.xml index 6ca4c0358..deafb9630 100644 --- a/res/layout/attachment.xml +++ b/res/layout/attachment.xml @@ -16,12 +16,16 @@ limitations under the License. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/AttachmentContainer" - android:focusableInTouchMode="true" - android:focusable="true"> + android:layout_width="match_parent" + android:layout_height="48dp" + android:background="@drawable/attachment_bg_holo" + android:focusable="true" + android:focusableInTouchMode="true"> <ImageView android:id="@+id/thumbnail" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:src="@drawable/ic_attach_file_20dp" android:layout_gravity="center_vertical" style="@style/AttachmentThumbnail"/> @@ -29,28 +33,36 @@ <!-- Attachment name and size --> <LinearLayout android:orientation="vertical" - android:layout_width="0dip" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:layout_gravity="center_vertical" style="@style/AttachmentTextContainer" > <TextView android:id="@+id/attachment_name" - style="@style/AttachmentName" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/attachment_name_color" + android:singleLine="true" /> <TextView android:id="@+id/attachment_size" - style="@style/AttachmentSize" /> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/text_color_hint_grey" + android:textSize="12sp" + android:singleLine="true" /> </LinearLayout> <!-- Remove button --> <ImageButton android:id="@+id/remove_attachment" - android:src="@drawable/ic_cancel_holo_light" - android:layout_width="48dip" + android:layout_width="48dp" android:layout_height="match_parent" + android:background="?android:attr/selectableItemBackground" android:clickable="true" android:gravity="center" - android:background="?android:attr/selectableItemBackground"/> + android:src="@drawable/ic_cancel_holo_light" /> </LinearLayout> diff --git a/res/layout/compose_attachment_tile.xml b/res/layout/compose_attachment_tile.xml index f3496f83e..aa68328db 100644 --- a/res/layout/compose_attachment_tile.xml +++ b/res/layout/compose_attachment_tile.xml @@ -76,6 +76,7 @@ android:layout_width="44dip" android:layout_height="44dip" android:layout_gravity="center_vertical|end|right" + android:contentDescription="@string/remove_attachment_desc" android:gravity="center" android:focusable="true" android:background="?android:attr/selectableItemBackground" /> diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml index f94abeac5..5dbe4940d 100644 --- a/res/values-ldrtl/styles-ldrtl.xml +++ b/res/values-ldrtl/styles-ldrtl.xml @@ -101,6 +101,10 @@ <item name="android:layout_marginStart">@dimen/attachment_icon_padding</item> </style> + <style name="AttachmentThumbnail"> + <item name="android:layout_marginStart">@dimen/attachment_item_padding_start</item> + </style> + <style name="UnreadCountWithMarginEndStyle" parent="UnreadCountRelativeLayout"> <item name="android:layout_marginEnd">@dimen/folder_list_item_end_margin</item> <item name="android:layout_alignParentEnd">true</item> diff --git a/res/values/colors.xml b/res/values/colors.xml index aa761318a..61960f9b2 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -82,6 +82,7 @@ <color name="widget_header_bg_color">#da4336</color> <color name="widget_conversation_list_divider_color">#e5e5e5</color> + <color name="attachment_name_color">#333333</color> <!-- Color of the semi-transparent shadow box on attachment tiles --> <color name="attachment_tile_shadow_box_color">#7F000000</color> <!-- Color of the subtitle message in the attachment tile --> diff --git a/res/values/dimen.xml b/res/values/dimen.xml index f071ea4c9..a811cee60 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -122,6 +122,7 @@ <dimen name="send_mail_as_padding">8dip</dimen> <dimen name="dismiss_separator_padding">16dip</dimen> <dimen name="teaser_text_padding">16dp</dimen> + <dimen name="attachment_item_padding_start">8dp</dimen> <dimen name="attachment_padding_start">16dp</dimen> <dimen name="attachment_padding_end">16dp</dimen> <dimen name="attachment_icon_padding">5dip</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index d0a48f5c5..098bb63ca 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -148,35 +148,6 @@ <item name="android:paddingRight">@dimen/compose_attachment_tile_text_end_padding</item> </style> - <style name="AttachmentContainer"> - <item name="android:background">@drawable/attachment_bg_holo</item> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">48dip</item> - </style> - - <style name="AttachmentTextContainer"> - <item name="android:paddingLeft">@dimen/compose_attachment_text_padding</item> - </style> - - <style name="AttachmentName"> - <item name="android:singleLine">true</item> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textColor">#333333</item> - <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> - </style> - - <style name="AttachmentSize" parent="@style/AttachmentName"> - <item name="android:textColor">#aaaaaa</item> - <item name="android:textSize">12sp</item> - </style> - - <style name="AttachmentThumbnail"> - <item name="android:layout_marginLeft">8dip</item> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - </style> - <style name="QuotedTextCheckbox"> <item name="android:layout_marginLeft">@dimen/quoted_text_checkbox_margin_offset</item> </style> @@ -668,6 +639,14 @@ <item name="android:layout_marginLeft">@dimen/attachment_icon_padding</item> </style> + <style name="AttachmentTextContainer"> + <item name="android:paddingLeft">@dimen/compose_attachment_text_padding</item> + </style> + + <style name="AttachmentThumbnail"> + <item name="android:layout_marginLeft">@dimen/attachment_item_padding_start</item> + </style> + <style name="UnreadCountWithMarginEndStyle" parent="UnreadCountRelativeLayout"> <item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item> <item name="android:layout_alignParentRight">true</item> |