From eaf748e6eecb4cb3644dcd950d56d1edb2d50a63 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Wed, 5 Jan 2011 16:11:08 -0800 Subject: [PATCH] Message list item: Use "activated" background for the selected message. This also fixes wired background flicker when you long-press. (Apparently you can't share StateListDrawable among multiple items...) Change-Id: I922f50a5b2a33731919e26a55bd3537d55057af5 --- res/drawable/message_list_read_selector.xml | 2 + res/drawable/message_list_unread_selector.xml | 2 + .../message_list_wide_read_selector.xml | 2 +- .../message_list_wide_unread_selector.xml | 2 +- .../email/activity/MessageListItem.java | 57 ++++++++++++++----- 5 files changed, 50 insertions(+), 15 deletions(-) diff --git a/res/drawable/message_list_read_selector.xml b/res/drawable/message_list_read_selector.xml index caa006680..54fa6070a 100644 --- a/res/drawable/message_list_read_selector.xml +++ b/res/drawable/message_list_read_selector.xml @@ -19,5 +19,7 @@ android:drawable="@drawable/list_message_focused_holo" /> + diff --git a/res/drawable/message_list_unread_selector.xml b/res/drawable/message_list_unread_selector.xml index 7f2081efe..b3f2159b4 100644 --- a/res/drawable/message_list_unread_selector.xml +++ b/res/drawable/message_list_unread_selector.xml @@ -19,5 +19,7 @@ android:drawable="@drawable/list_message_focused_holo" /> + diff --git a/res/drawable/message_list_wide_read_selector.xml b/res/drawable/message_list_wide_read_selector.xml index 39bcab28e..2dc6ba50a 100644 --- a/res/drawable/message_list_wide_read_selector.xml +++ b/res/drawable/message_list_wide_read_selector.xml @@ -15,7 +15,7 @@ --> - diff --git a/res/drawable/message_list_wide_unread_selector.xml b/res/drawable/message_list_wide_unread_selector.xml index f27bd0c5d..597985e5e 100644 --- a/res/drawable/message_list_wide_unread_selector.xml +++ b/res/drawable/message_list_wide_unread_selector.xml @@ -15,7 +15,7 @@ --> - diff --git a/src/com/android/email/activity/MessageListItem.java b/src/com/android/email/activity/MessageListItem.java index 6011c2ef3..cfa659b88 100644 --- a/src/com/android/email/activity/MessageListItem.java +++ b/src/com/android/email/activity/MessageListItem.java @@ -137,10 +137,12 @@ public class MessageListItem extends View { private static int sColorTipHeight; private static int sColorTipRightMarginOnNarrow; private static int sColorTipRightMarginOnWide; - private static Drawable sReadSelector; - private static Drawable sUnreadSelector; - private static Drawable sWideReadSelector; - private static Drawable sWideUnreadSelector; + + // Note: these cannot be shared Drawables because they are selectors which have state. + private Drawable mReadSelector; + private Drawable mUnreadSelector; + private Drawable mWideReadSelector; + private Drawable mWideUnreadSelector; public int mSnippetLineCount = NEEDS_LAYOUT; private final CharSequence[] mSnippetLines = new CharSequence[MAX_SUBJECT_SNIPPET_LINES]; @@ -210,10 +212,6 @@ public class MessageListItem extends View { BitmapFactory.decodeResource(r, R.drawable.btn_check_off_normal_holo_light); sSelectedIconOn = BitmapFactory.decodeResource(r, R.drawable.btn_check_on_normal_holo_light); - sReadSelector = r.getDrawable(R.drawable.message_list_read_selector); - sUnreadSelector = r.getDrawable(R.drawable.message_list_unread_selector); - sWideReadSelector = r.getDrawable(R.drawable.message_list_wide_read_selector); - sWideUnreadSelector = r.getDrawable(R.drawable.message_list_wide_unread_selector); sFavoriteIconWidth = sFavoriteIconOff.getWidth(); sInit = true; @@ -234,21 +232,47 @@ public class MessageListItem extends View { return mode; } - private void calculateDrawingData() { + private Drawable mCurentBackground = null; // Only used by updateBackground() + + /* package */ void updateBackground() { + final Drawable newBackground; if (mRead) { if (mMode == MODE_WIDE) { - setBackgroundDrawable(sWideReadSelector); + if (mWideReadSelector == null) { + mWideReadSelector = getContext().getResources() + .getDrawable(R.drawable.message_list_wide_read_selector); + } + newBackground = mWideReadSelector; } else { - setBackgroundDrawable(sReadSelector); + if (mReadSelector == null) { + mReadSelector = getContext().getResources() + .getDrawable(R.drawable.message_list_read_selector); + } + newBackground = mReadSelector; } } else { if (mMode == MODE_WIDE) { - setBackgroundDrawable(sWideUnreadSelector); + if (mWideUnreadSelector == null) { + mWideUnreadSelector = getContext().getResources() + .getDrawable(R.drawable.message_list_wide_unread_selector); + } + newBackground = mWideUnreadSelector; } else { - setBackgroundDrawable(sUnreadSelector); + if (mUnreadSelector == null) { + mUnreadSelector = getContext().getResources() + .getDrawable(R.drawable.message_list_unread_selector); + } + newBackground = mUnreadSelector; } } + if (newBackground != mCurentBackground) { + // setBackgroundDrawable is a heavy operation. Only call it when really needed. + setBackgroundDrawable(newBackground); + mCurentBackground = newBackground; + } + } + private void calculateDrawingData() { SpannableStringBuilder ssb = new SpannableStringBuilder(); boolean hasSubject = false; if (!TextUtils.isEmpty(mSubject)) { @@ -357,6 +381,13 @@ public class MessageListItem extends View { return result; } + @Override + public void draw(Canvas canvas) { + // Update the background, before View.draw() draws it. + updateBackground(); + super.draw(canvas); + } + @Override protected void onDraw(Canvas canvas) { if (mSnippetLineCount == NEEDS_LAYOUT) {