diff options
Diffstat (limited to 'res/layout')
5 files changed, 7 insertions, 6 deletions
diff --git a/res/layout/conversation_footer.xml b/res/layout/conversation_footer.xml index 25c970eb1..49b3e2bc0 100644 --- a/res/layout/conversation_footer.xml +++ b/res/layout/conversation_footer.xml @@ -28,6 +28,7 @@ android:background="@color/conversation_view_border_color"/> <LinearLayout + android:id="@+id/footer_buttons" android:layout_width="match_parent" android:layout_height="wrap_content" > diff --git a/res/layout/conversation_message_upper_header.xml b/res/layout/conversation_message_upper_header.xml index a57b8188d..5422851ee 100644 --- a/res/layout/conversation_message_upper_header.xml +++ b/res/layout/conversation_message_upper_header.xml @@ -46,9 +46,10 @@ android:layout_height="@dimen/contact_image_height" android:layout_marginTop="@dimen/message_header_contact_photo_margin" android:layout_marginBottom="@dimen/message_header_contact_photo_margin" - android:visibility="gone" + android:background="@drawable/draft_background_circle" android:scaleType="center" - android:src="@drawable/ic_draft" + android:src="@drawable/ic_drafts_wht_24dp" + android:visibility="gone" style="@style/ConversationViewMarginStyle" /> <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_actions.xml b/res/layout/conversation_message_upper_header_actions.xml index d5a04c040..ab98ec3ec 100644 --- a/res/layout/conversation_message_upper_header_actions.xml +++ b/res/layout/conversation_message_upper_header_actions.xml @@ -20,7 +20,7 @@ android:id="@+id/edit_draft" style="@style/MessageHeaderActionButtonStyle" android:visibility="gone" - android:src="@drawable/ic_edit_holo_light" + android:src="@drawable/ic_edit_24dp" android:contentDescription="@string/resume_draft" /> <ImageView android:id="@+id/reply" diff --git a/res/layout/conversation_message_upper_header_actions_land_or_tablet.xml b/res/layout/conversation_message_upper_header_actions_land_or_tablet.xml index d42c0f2f7..e9ab53c5e 100644 --- a/res/layout/conversation_message_upper_header_actions_land_or_tablet.xml +++ b/res/layout/conversation_message_upper_header_actions_land_or_tablet.xml @@ -20,7 +20,7 @@ android:id="@+id/edit_draft" style="@style/MessageHeaderActionButtonStyle" android:visibility="gone" - android:src="@drawable/ic_edit_holo_light" + android:src="@drawable/ic_edit_24dp" android:contentDescription="@string/resume_draft" /> <ImageView android:id="@+id/reply" diff --git a/res/layout/super_collapsed_block.xml b/res/layout/super_collapsed_block.xml index a0995a36d..f686ef9b3 100644 --- a/res/layout/super_collapsed_block.xml +++ b/res/layout/super_collapsed_block.xml @@ -50,7 +50,6 @@ android:background="@drawable/super_collapse_circle" android:contentDescription="@null" android:gravity="center" - android:textSize="@dimen/super_collapsed_text_size" - android:textColor="@color/conversation_view_text_color_light" /> + android:textSize="@dimen/super_collapsed_text_size" /> </com.android.mail.browse.SuperCollapsedBlock> |