commit 2e607aebf60ae43413d244548a7e41edf681e4a7
author Jin Cao <jinyan@google.com> Mon Sep 15 17:50:03 2014 -0700
committer Jin Cao <jinyan@google.com> Mon Sep 15 17:53:34 2014 -0700
tree 6c22228755eb10b908abfde65c641a3f1a2334b9
parent 114128a8f9531a602ca7dd41506a68e79c127d05

Use attachment cache on layout passes

Avoid trying to load the preview bitmap if the attachment
is already cached.

b/17365401

Change-Id: Ie3a24f25749cca8da402894ac57dd1181a510b6a

src/com/android/mail/ui/AttachmentTile.java

diff --git a/src/com/android/mail/ui/AttachmentTile.java b/src/com/android/mail/ui/AttachmentTile.java
index 3fc8dc5..da1a4b9 100644
--- a/src/com/android/mail/ui/AttachmentTile.java
+++ b/src/com/android/mail/ui/AttachmentTile.java
@@ -94,7 +94,7 @@
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
         super.onLayout(changed, l, t, r, b);
 
-        ThumbnailLoadTask.setupThumbnailPreview(this, mAttachment, null);
+        ThumbnailLoadTask.setupThumbnailPreview(mAttachmentPreviewCache, this, mAttachment, null);
     }
 
     public Attachment getAttachment() {
@@ -136,7 +136,8 @@
             updateSubtitleText();
         }
 
-        ThumbnailLoadTask.setupThumbnailPreview(this, attachment, prevAttachment);
+        ThumbnailLoadTask.setupThumbnailPreview(mAttachmentPreviewCache, this, attachment,
+                prevAttachment);
     }
 
     private void updateSubtitleText() {
@@ -153,7 +154,7 @@
 
     @Override
     public void setThumbnailToDefault() {
-        Bitmap cachedPreview = mAttachmentPreviewCache.get(mAttachment);
+        final Bitmap cachedPreview = mAttachmentPreviewCache.get(mAttachment);
         if (cachedPreview != null) {
             setThumbnail(cachedPreview);
             return;

src/com/android/mail/ui/ThumbnailLoadTask.java

diff --git a/src/com/android/mail/ui/ThumbnailLoadTask.java b/src/com/android/mail/ui/ThumbnailLoadTask.java
index bfe6ae9..3709eee 100644
--- a/src/com/android/mail/ui/ThumbnailLoadTask.java
+++ b/src/com/android/mail/ui/ThumbnailLoadTask.java
@@ -48,8 +48,17 @@
     private final int mWidth;
     private final int mHeight;
 
-    public static void setupThumbnailPreview(final AttachmentBitmapHolder holder,
-            final Attachment attachment, final Attachment prevAttachment) {
+    public static void setupThumbnailPreview(AttachmentTile.AttachmentPreviewCache cache,
+            AttachmentBitmapHolder holder, Attachment attachment, Attachment prevAttachment) {
+        // Check cache first
+        if (cache != null) {
+            final Bitmap cached = cache.get(attachment);
+            if (cached != null) {
+                holder.setThumbnail(cached);
+                return;
+            }
+        }
+
         final int width = holder.getThumbnailWidth();
         final int height = holder.getThumbnailHeight();
         if (attachment == null || width == 0 || height == 0