Merge change 25903 into eclair

* changes:
  Fix bug that caused Cc field to be displayed when empty.
This commit is contained in:
Android (Google) Code Review 2009-09-19 16:52:28 -04:00
commit 02df29b647

View File

@ -1168,8 +1168,9 @@ public class MessageView extends Activity implements OnClickListener {
mTimeView.setText(mTimeFormat.format(date)); mTimeView.setText(mTimeFormat.format(date));
mDateView.setText(Utility.isDateToday(date) ? null : mDateFormat.format(date)); mDateView.setText(Utility.isDateToday(date) ? null : mDateFormat.format(date));
mToView.setText(Address.toFriendly(Address.unpack(message.mTo))); mToView.setText(Address.toFriendly(Address.unpack(message.mTo)));
mCcView.setText(Address.toFriendly(Address.unpack(message.mCc))); String friendlyCc = Address.toFriendly(Address.unpack(message.mCc));
mCcContainerView.setVisibility((message.mCc != null) ? View.VISIBLE : View.GONE); mCcView.setText(friendlyCc);
mCcContainerView.setVisibility((friendlyCc != null) ? View.VISIBLE : View.GONE);
mAttachmentIcon.setVisibility(message.mAttachments != null ? View.VISIBLE : View.GONE); mAttachmentIcon.setVisibility(message.mAttachments != null ? View.VISIBLE : View.GONE);
mFavoriteIcon.setImageDrawable(message.mFlagFavorite ? mFavoriteIconOn : mFavoriteIconOff); mFavoriteIcon.setImageDrawable(message.mFlagFavorite ? mFavoriteIconOn : mFavoriteIconOff);