am 02df29b6: Merge change 25903 into eclair

Merge commit '02df29b647ae77f0ff283ab9ace737b077db3509' into eclair-plus-aosp

* commit '02df29b647ae77f0ff283ab9ace737b077db3509':
  Fix bug that caused Cc field to be displayed when empty.
This commit is contained in:
Andrew Stadler 2009-09-19 13:57:51 -07:00 committed by Android Git Automerger
commit 43ee5fdcb9

View File

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