Merge "fix "show pictures" button state after the view is recycled" into jb-ub-mail
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 79fb2a9..bffaaa6 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -561,13 +561,6 @@
}
}
- private void setShowImages(final boolean showImages) {
- // use View's 'show images' flag to store whether we are currently displaying images
- if (mMessageHeaderItem != null) {
- mMessageHeaderItem.setShowImages(showImages);
- }
- }
-
/**
* Update the visibility of the many child views based on expanded/collapsed
* and draft/normal state.
@@ -1087,6 +1080,9 @@
if (mCallbacks != null) {
mCallbacks.showExternalResources(mMessage);
}
+ if (mMessageHeaderItem != null) {
+ mMessageHeaderItem.setShowImages(true);
+ }
showImagePromptAlways(false);
break;
case SHOW_IMAGE_PROMPT_ALWAYS: