Don't try to show thumbnail for unloaded attachments
Bug: 3292689 Change-Id: I7575cb891f0b46c4a8564b5d2c4907025d91c639
This commit is contained in:
parent
8b9f2a7284
commit
9c4458dcd7
|
@ -48,8 +48,6 @@ import android.content.Loader;
|
||||||
import android.database.ContentObserver;
|
import android.database.ContentObserver;
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
import android.graphics.BitmapFactory;
|
import android.graphics.BitmapFactory;
|
||||||
import android.graphics.drawable.ColorDrawable;
|
|
||||||
import android.graphics.drawable.Drawable;
|
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
@ -1151,6 +1149,11 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
|
||||||
attachmentView.setVisibility(View.VISIBLE);
|
attachmentView.setVisibility(View.VISIBLE);
|
||||||
attachmentLoad.setVisibility(View.INVISIBLE);
|
attachmentLoad.setVisibility(View.INVISIBLE);
|
||||||
attachmentCancel.setVisibility(View.GONE);
|
attachmentCancel.setVisibility(View.GONE);
|
||||||
|
|
||||||
|
Bitmap previewIcon = getPreviewIcon(attachmentInfo);
|
||||||
|
if (previewIcon != null) {
|
||||||
|
attachmentIcon.setImageBitmap(previewIcon);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// Show "Load"; hide "View" and "Save"
|
// Show "Load"; hide "View" and "Save"
|
||||||
attachmentSave.setVisibility(View.INVISIBLE);
|
attachmentSave.setVisibility(View.INVISIBLE);
|
||||||
|
@ -1186,11 +1189,6 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
|
||||||
attachmentName.setText(attachmentInfo.name);
|
attachmentName.setText(attachmentInfo.name);
|
||||||
attachmentInfoView.setText(Utility.formatSize(mContext, attachmentInfo.size));
|
attachmentInfoView.setText(Utility.formatSize(mContext, attachmentInfo.size));
|
||||||
|
|
||||||
Bitmap previewIcon = getPreviewIcon(attachmentInfo);
|
|
||||||
if (previewIcon != null) {
|
|
||||||
attachmentIcon.setImageBitmap(previewIcon);
|
|
||||||
}
|
|
||||||
|
|
||||||
mAttachments.addView(view);
|
mAttachments.addView(view);
|
||||||
mAttachments.setVisibility(View.VISIBLE);
|
mAttachments.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue