am d135ac61: Merge "Update attachment buttons after loading attachment" into honeycomb-mr1

* commit 'd135ac61ee22c81509c71273b2d053fc36ea210a':
  Update attachment buttons after loading attachment
This commit is contained in:
Todd Kennedy 2011-03-10 14:25:40 -08:00 committed by Android Git Automerger
commit f94fdfd4b5

View File

@ -183,7 +183,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
/** /**
* Flags to control the tabs. * Flags to control the tabs.
* @see #updateTabFlags(int) * @see #updateTabs(int)
*/ */
private int mTabFlags; private int mTabFlags;
@ -857,14 +857,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
MessageViewAttachmentInfo info = findAttachmentInfo(attachmentId); MessageViewAttachmentInfo info = findAttachmentInfo(attachmentId);
if (info != null) { if (info != null) {
info.loaded = true; info.loaded = true;
updateAttachmentButtons(info);
info.loadButton.setVisibility(View.GONE);
info.cancelButton.setVisibility(View.GONE);
boolean showSave = info.mAllowSave && !TextUtils.isEmpty(info.mName);
boolean showView = info.mAllowView;
info.saveButton.setVisibility(showSave ? View.VISIBLE : View.GONE);
info.openButton.setVisibility(showView ? View.VISIBLE : View.GONE);
} }
} }