Update layout so that conv items without labels dont look broken.
Change-Id: I80c387a66ff9c9050bc97bd7d9f33c486aee8424
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 2a85b68..9fa4d82 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -19,8 +19,8 @@
<dimen name="senders_font_size">18sp</dimen>
<dimen name="account_dropdown_dropdownwidth">496dip</dimen>
<dimen name="wide_senders_margin_top">3sp</dimen>
- <dimen name="wide_attachment_margin_top">2sp</dimen>
- <dimen name="wide_date_margin_top">4sp</dimen>
+ <dimen name="wide_attachment_margin_top">14sp</dimen>
+ <dimen name="wide_date_margin_top">16sp</dimen>
<dimen name="max_total_folder_width_wide">128dip</dimen>
<dimen name="wide_subject_margin_right">28dip</dimen>
<dimen name="subject_width">238dip</dimen>
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 7e4ce7d..ad203d3 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -676,7 +676,7 @@
mHeader.dateBackground = DATE_BACKGROUND;
int leftOffset = (mHeader.conversation.hasAttachments ? mPaperclipX : mDateX)
- DATE_BACKGROUND_PADDING_LEFT;
- int top = mCoordinates.foldersY;
+ int top = mCoordinates.showFolders ? mCoordinates.foldersY : mCoordinates.dateY;
Rect src = new Rect(0, 0, mHeader.dateBackground.getWidth(), mHeader.dateBackground
.getHeight());
Rect dst = new Rect(leftOffset, top, mViewWidth, top + sDateBackgroundHeight);