CV attachments. b/16138036.

Change-Id: I612bb54ccd2710754be03d9b4a566da544780d09

4 files changed, 18 insertions, 22 deletions

diff --git a/src/com/android/mail/browse/ConversationViewAdapter.java b/src/com/android/mail/browse/ConversationViewAdapter.java
index 3408589ab..b63305d13 100644
--- a/src/com/android/mail/browse/ConversationViewAdapter.java
+++ b/src/com/android/mail/browse/ConversationViewAdapter.java
@@ -373,7 +373,7 @@ public class ConversationViewAdapter extends BaseAdapter {
         @Override
         public void bindView(View v, boolean measureOnly) {
             final MessageFooterView attachmentsView = (MessageFooterView) v;
-            attachmentsView.bind(mHeaderItem, this, measureOnly);
+            attachmentsView.bind(mHeaderItem, measureOnly);
         }
 
         @Override
diff --git a/src/com/android/mail/browse/MessageFooterView.java b/src/com/android/mail/browse/MessageFooterView.java
index 73f500217..d5b65d776 100644
--- a/src/com/android/mail/browse/MessageFooterView.java
+++ b/src/com/android/mail/browse/MessageFooterView.java
@@ -31,13 +31,11 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.android.mail.R;
 import com.android.mail.analytics.Analytics;
 import com.android.mail.browse.AttachmentLoader.AttachmentCursor;
 import com.android.mail.browse.ConversationContainer.DetachListener;
-import com.android.mail.browse.ConversationViewAdapter.MessageFooterItem;
 import com.android.mail.browse.ConversationViewAdapter.MessageHeaderItem;
 import com.android.mail.providers.Account;
 import com.android.mail.providers.Attachment;
@@ -56,13 +54,11 @@ import java.util.List;
 public class MessageFooterView extends LinearLayout implements DetachListener,
         LoaderManager.LoaderCallbacks<Cursor>, View.OnClickListener {
 
-    private MessageFooterItem mMessageFooterItem;
     private MessageHeaderItem mMessageHeaderItem;
     private LoaderManager mLoaderManager;
     private FragmentManager mFragmentManager;
     private AttachmentCursor mAttachmentsCursor;
     private View mViewEntireMessagePrompt;
-    private TextView mTitleText;
     private AttachmentTileGrid mAttachmentGrid;
     private LinearLayout mAttachmentBarList;
 
@@ -104,7 +100,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener,
         super.onFinishInflate();
 
         mViewEntireMessagePrompt = findViewById(R.id.view_entire_message_prompt);
-        mTitleText = (TextView) findViewById(R.id.attachments_header_text);
         mAttachmentGrid = (AttachmentTileGrid) findViewById(R.id.attachment_tile_grid);
         mAttachmentBarList = (LinearLayout) findViewById(R.id.attachment_bar_list);
 
@@ -120,8 +115,7 @@ public class MessageFooterView extends LinearLayout implements DetachListener,
     }
 
     public void bind(
-            MessageHeaderItem headerItem, MessageFooterItem footerItem, boolean measureOnly) {
-        mMessageFooterItem = footerItem;
+            MessageHeaderItem headerItem, boolean measureOnly) {
         mMessageHeaderItem = headerItem;
 
         final Integer attachmentLoaderId = getAttachmentLoaderId();
@@ -138,7 +132,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener,
             mAttachmentGrid.removeAllViewsInLayout();
             mAttachmentBarList.removeAllViewsInLayout();
             mViewEntireMessagePrompt.setVisibility(View.GONE);
-            mTitleText.setVisibility(View.GONE);
             mAttachmentGrid.setVisibility(View.GONE);
             mAttachmentBarList.setVisibility(View.GONE);
         }
@@ -210,8 +203,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener,
             return;
         }
 
-        mTitleText.setVisibility(View.VISIBLE);
-
         if (!tiledAttachments.isEmpty()) {
             renderTiledAttachments(tiledAttachments, loaderResult);
         }
diff --git a/src/com/android/mail/ui/AttachmentTileGrid.java b/src/com/android/mail/ui/AttachmentTileGrid.java
index b5fefcc09..5b1e76f95 100644
--- a/src/com/android/mail/ui/AttachmentTileGrid.java
+++ b/src/com/android/mail/ui/AttachmentTileGrid.java
@@ -18,6 +18,7 @@ package com.android.mail.ui;
 
 import android.app.FragmentManager;
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -48,6 +49,7 @@ public class AttachmentTileGrid extends FrameLayout implements AttachmentPreview
         MessageAttachmentTile.PhotoViewHandler {
     private final LayoutInflater mInflater;
     private final int mTileMinSize;
+    private final int mTilePadding;
     private int mColumnCount;
     private List<Attachment> mAttachments;
     private final HashMap<String, AttachmentPreview> mAttachmentPreviews;
@@ -58,8 +60,9 @@ public class AttachmentTileGrid extends FrameLayout implements AttachmentPreview
     public AttachmentTileGrid(Context context, AttributeSet attrs) {
         super(context, attrs);
         mInflater = LayoutInflater.from(context);
-        mTileMinSize = context.getResources()
-                .getDimensionPixelSize(R.dimen.attachment_tile_min_size);
+        final Resources res = context.getResources();
+        mTileMinSize = res.getDimensionPixelSize(R.dimen.attachment_tile_min_size);
+        mTilePadding = res.getDimensionPixelSize(R.dimen.attachment_tile_padding);
         mAttachmentPreviews = Maps.newHashMap();
     }
 
@@ -150,8 +153,10 @@ public class AttachmentTileGrid extends FrameLayout implements AttachmentPreview
         //    Let width = given width.
         //    Let height = image size + bottom padding.
 
-        final int imageSize = (width) / mColumnCount;
-        final int remainder = width - (imageSize * mColumnCount);
+        final int widthMinusPadding = width - (mColumnCount - 1) * mTilePadding;
+
+        final int imageSize = (widthMinusPadding) / mColumnCount;
+        final int remainder = widthMinusPadding - (imageSize * mColumnCount);
 
         for (int i = 0; i < childCount; i++) {
             final View child = getChildAt(i);
@@ -167,7 +172,8 @@ public class AttachmentTileGrid extends FrameLayout implements AttachmentPreview
         // Then multiply by the height of one tile to get the grid height.
         final int numRows = ((childCount - 1) / mColumnCount) + 1;
         setMeasuredDimension(width,
-                numRows*(imageSize + getChildAt(0).getPaddingBottom()));
+                numRows * (imageSize + getChildAt(0).getPaddingBottom()) +
+                (numRows - 1) * mTilePadding);
     }
 
     @Override
@@ -184,7 +190,7 @@ public class AttachmentTileGrid extends FrameLayout implements AttachmentPreview
         boolean skipBeginningOfRowFirstTime = true;
         final boolean isRtl = ViewUtils.isViewRtl(this);
         final int width = getMeasuredWidth();
-        int childLeft = (isRtl) ? width - getChildAt(0).getMeasuredWidth() : 0;;
+        int childLeft = (isRtl) ? width - getChildAt(0).getMeasuredWidth() : 0;
         int childTop = 0;
 
         // Layout the grid.
@@ -200,7 +206,7 @@ public class AttachmentTileGrid extends FrameLayout implements AttachmentPreview
             // to reflect the top of the new row.
             if (!skipBeginningOfRowFirstTime && i % mColumnCount == 0) {
                 childLeft = (isRtl) ? width - childWidth : 0;
-                childTop += childHeight;
+                childTop += childHeight + mTilePadding;
             } else {
                 skipBeginningOfRowFirstTime = false;
             }
@@ -209,9 +215,9 @@ public class AttachmentTileGrid extends FrameLayout implements AttachmentPreview
                     childLeft + childWidth, childTop + childHeight);
 
             if (isRtl) {
-                childLeft -= childWidth;
+                childLeft -= childWidth - mTilePadding;
             } else {
-                childLeft += childWidth;
+                childLeft += childWidth + mTilePadding;
             }
         }
     }
diff --git a/src/com/android/mail/ui/SecureConversationViewController.java b/src/com/android/mail/ui/SecureConversationViewController.java
index ea836e498..325ad56ce 100644
--- a/src/com/android/mail/ui/SecureConversationViewController.java
+++ b/src/com/android/mail/ui/SecureConversationViewController.java
@@ -214,8 +214,7 @@ public class SecureConversationViewController implements
 
         if (mMessage.hasAttachments) {
             mMessageFooterView.setVisibility(View.VISIBLE);
-            mMessageFooterView.bind(
-                    item, ConversationViewAdapter.newMessageFooterItem(null, item), false);
+            mMessageFooterView.bind(item, false);
         }
     }