diff options
author | James Lemieux <jplemieux@google.com> | 2014-08-18 18:05:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-16 03:56:00 +0000 |
commit | 47da4ce65aebb78dde6c3ce273e95b547360bec2 (patch) | |
tree | ff0897160ff894a7d7ec0763ed7dca7d46f9c5ee /src | |
parent | 1b7a74b590c952132883f5176f20d82d92f2e3f7 (diff) | |
parent | cace3194e9b7b0e2b6554bda2fa8b2f98da04175 (diff) | |
download | android_packages_apps_UnifiedEmail-47da4ce65aebb78dde6c3ce273e95b547360bec2.tar.gz android_packages_apps_UnifiedEmail-47da4ce65aebb78dde6c3ce273e95b547360bec2.tar.bz2 android_packages_apps_UnifiedEmail-47da4ce65aebb78dde6c3ce273e95b547360bec2.zip |
Merge "Implement inset dividers in Thread List" into ub-gmail-ur14-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/mail/browse/ConversationItemView.java | 18 | ||||
-rw-r--r-- | src/com/android/mail/browse/ConversationListFooterView.java | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java index effce31f6..f62c7dd12 100644 --- a/src/com/android/mail/browse/ConversationItemView.java +++ b/src/com/android/mail/browse/ConversationItemView.java @@ -147,11 +147,16 @@ public class ConversationItemView extends View private static int sBadgePaddingExtraWidth; private static int sBadgeRoundedCornerRadius; private static int sFolderRoundedCornerRadius; + private static int sDividerColor; // Static paints. private static final TextPaint sPaint = new TextPaint(); private static final TextPaint sFoldersPaint = new TextPaint(); private static final Paint sCheckBackgroundPaint = new Paint(); + private static final Paint sDividerPaint = new Paint(); + + private static int sDividerInset; + private static int sDividerHeight; private static BroadcastReceiver sConfigurationChangedReceiver; @@ -539,6 +544,9 @@ public class ConversationItemView extends View res.getDimensionPixelSize(R.dimen.badge_rounded_corner_radius); sFolderRoundedCornerRadius = res.getDimensionPixelOffset(R.dimen.folder_rounded_corner_radius); + sDividerColor = res.getColor(R.color.conversation_list_divider_color); + sDividerInset = res.getDimensionPixelSize(R.dimen.conv_list_divider_inset); + sDividerHeight = res.getDimensionPixelSize(R.dimen.divider_height); } } @@ -1358,6 +1366,12 @@ public class ConversationItemView extends View VISIBLE_CONVERSATION_HIGHLIGHT.draw(canvas); } } + + // draw the inset divider + sDividerPaint.setColor(sDividerColor); + final int dividerBottomY = getHeight(); + final int dividerTopY = dividerBottomY - sDividerHeight; + canvas.drawRect(sDividerInset, dividerTopY, getWidth(), dividerBottomY, sDividerPaint); Utils.traceEndSection(); } @@ -1413,10 +1427,8 @@ public class ConversationItemView extends View final int background; if (mBackgroundOverrideResId > 0) { background = mBackgroundOverrideResId; - } else if (mHeader.unread) { - background = R.drawable.conversation_unread_selector; } else { - background = R.drawable.conversation_read_selector; + background = R.drawable.conversation_item_background_selector; } setBackgroundResource(background); } diff --git a/src/com/android/mail/browse/ConversationListFooterView.java b/src/com/android/mail/browse/ConversationListFooterView.java index 38ae225b9..53ec81c3d 100644 --- a/src/com/android/mail/browse/ConversationListFooterView.java +++ b/src/com/android/mail/browse/ConversationListFooterView.java @@ -200,7 +200,7 @@ public final class ConversationListFooterView extends LinearLayout implements Vi private Drawable getNormalBackground() { if (sNormalBackground == null) { - sNormalBackground = getBackground(R.drawable.conversation_unread_selector); + sNormalBackground = getBackground(R.drawable.conversation_item_background_selector); } return sNormalBackground; } |