From a262f908aef5ee15db8dc7fcef0bbc81e820b7bb Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Wed, 8 Sep 2010 16:09:11 -0700 Subject: [PATCH] Show total message count for Outbox/Sent Instead of unread count. Change-Id: I90fe96093bc31f26e4cacacf6adfb0a3cf009d04 --- .../email/activity/MailboxesAdapter.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/com/android/email/activity/MailboxesAdapter.java b/src/com/android/email/activity/MailboxesAdapter.java index 5952e7de7..f2ebd4f06 100644 --- a/src/com/android/email/activity/MailboxesAdapter.java +++ b/src/com/android/email/activity/MailboxesAdapter.java @@ -105,28 +105,30 @@ import android.widget.TextView; } // Set count - final int count = cursor.getInt((type == Mailbox.TYPE_DRAFTS || type == Mailbox.TYPE_TRASH) - ? COLUMN_MESSAGE_COUNT : COLUMN_UNREAD_COUNT); + boolean useTotalCount = false; + switch (type) { + case Mailbox.TYPE_DRAFTS: + case Mailbox.TYPE_OUTBOX: + case Mailbox.TYPE_SENT: + case Mailbox.TYPE_TRASH: + useTotalCount = true; + break; + } + final int count = cursor.getInt(useTotalCount ? COLUMN_MESSAGE_COUNT : COLUMN_UNREAD_COUNT); final TextView unreadCountView = (TextView) view.findViewById(R.id.new_message_count); final TextView allCountView = (TextView) view.findViewById(R.id.all_message_count); // If the unread count is zero, not to show countView. if (count > 0) { nameView.setTypeface(Typeface.DEFAULT_BOLD); - switch (type) { - case Mailbox.TYPE_DRAFTS: - case Mailbox.TYPE_OUTBOX: - case Mailbox.TYPE_SENT: - case Mailbox.TYPE_TRASH: - unreadCountView.setVisibility(View.GONE); - allCountView.setVisibility(View.VISIBLE); - allCountView.setText(Integer.toString(count)); - break; - default: - allCountView.setVisibility(View.GONE); - unreadCountView.setVisibility(View.VISIBLE); - unreadCountView.setText(Integer.toString(count)); - break; + if (useTotalCount) { + unreadCountView.setVisibility(View.GONE); + allCountView.setVisibility(View.VISIBLE); + allCountView.setText(Integer.toString(count)); + } else { + allCountView.setVisibility(View.GONE); + unreadCountView.setVisibility(View.VISIBLE); + unreadCountView.setText(Integer.toString(count)); } } else { nameView.setTypeface(Typeface.DEFAULT);