diff --git a/src/com/android/email/Email.java b/src/com/android/email/Email.java index ee2f0a095..0d8b9ba47 100644 --- a/src/com/android/email/Email.java +++ b/src/com/android/email/Email.java @@ -168,7 +168,7 @@ public class Email extends Application { public static final String TIME_FORMAT_12 = "h:mm a"; public static final String TIME_FORMAT_24 = "H:mm"; - public static final int FLAGGED_COLOR = 0xffff4444; + public static final int FLAGGED_COLOR = 0xff4444; public static final String INTENT_DATA_URI_SCHEMA = "content"; public static final String INTENT_DATA_UR_PATH_PREFIX = "email"; diff --git a/src/com/android/email/activity/FolderMessageList.java b/src/com/android/email/activity/FolderMessageList.java index 963f320f9..418ea2d45 100644 --- a/src/com/android/email/activity/FolderMessageList.java +++ b/src/com/android/email/activity/FolderMessageList.java @@ -2211,28 +2211,24 @@ public class FolderMessageList extends ExpandableListActivity holder.subject.setTypeface(null, message.read && !message.flagged ? Typeface.NORMAL : Typeface.BOLD); + int subjectColor = 0x000000; + int alpha = 0xff000000; + if (message.flagged) { - holder.subject.setTextColor(Email.FLAGGED_COLOR); - } - else - { - - // Removing that block of code from FolderMessageList means that flagging any - // single message in a folder causes random messages to have their subjects - // switch to the flagged color. -danapple - holder.subject.setTextColor(0xff000000); + subjectColor = Email.FLAGGED_COLOR; } if (! message.partially_downloaded && !message.downloaded ) { - holder.chip.getBackground().setAlpha(127); - holder.subject.setTextColor(0x60000000); - holder.date.setTextColor(0x60000000); - holder.from.setTextColor(0x60000000); + holder.chip.getBackground().setAlpha(message.read ? 0 : 127); + alpha = 0x60000000; } else { - holder.date.setTextColor(0xff000000); - holder.from.setTextColor(0xff000000); + alpha = 0xff000000; } + + holder.subject.setTextColor(alpha | subjectColor); + holder.date.setTextColor(alpha); // The rest is just black (000000) for now + holder.from.setTextColor(alpha); holder.subject.setText(message.subject); diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java index f7612e72d..a343e904d 100644 --- a/src/com/android/email/activity/MessageView.java +++ b/src/com/android/email/activity/MessageView.java @@ -228,7 +228,7 @@ public class MessageView extends Activity mToView.setText(values[3]); mAttachmentIcon.setVisibility(msg.arg1 == 1 ? View.VISIBLE : View.GONE); if ((msg.arg2 & FLAG_FLAGGED) != 0) { - mSubjectView.setTextColor(Email.FLAGGED_COLOR); + mSubjectView.setTextColor(0xff000000 | Email.FLAGGED_COLOR); } else { mSubjectView.setTextColor(0xff000000);