1 files changed, 1 insertions, 73 deletions

diff --git a/src/com/android/mail/browse/MessageFooterView.java b/src/com/android/mail/browse/MessageFooterView.java
index a8ade0afe..d5b65d776 100644
--- a/src/com/android/mail/browse/MessageFooterView.java
+++ b/src/com/android/mail/browse/MessageFooterView.java
@@ -30,26 +30,21 @@ import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 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;
-import com.android.mail.providers.Conversation;
 import com.android.mail.providers.Message;
 import com.android.mail.ui.AccountFeedbackActivity;
 import com.android.mail.ui.AttachmentTile;
 import com.android.mail.ui.AttachmentTileGrid;
 import com.android.mail.utils.LogTag;
 import com.android.mail.utils.LogUtils;
-import com.android.mail.utils.Utils;
 import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 
@@ -59,16 +54,13 @@ 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;
-    private View mAboveAttachmentBarListLayout;
 
     private final LayoutInflater mInflater;
 
@@ -86,12 +78,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener,
      * Callbacks for the MessageFooterView to enable resizing the height.
      */
     public interface MessageFooterCallbacks {
-        void setMessageSpacerHeight(MessageFooterItem item, int newSpacerHeight);
-
-        MessageFooterView getViewForItem(MessageFooterItem item);
-
-        int getUpdatedHeight(MessageFooterItem item);
-
         /**
          * @return <tt>true</tt> if this footer is contained within a SecureConversationViewFragment
          * and cannot assume the content is <strong>not</strong> malicious
@@ -114,10 +100,8 @@ 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);
-        mAboveAttachmentBarListLayout = findViewById(R.id.above_attachment_bar_list_layout);
 
         mViewEntireMessagePrompt.setOnClickListener(this);
     }
@@ -131,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();
@@ -149,10 +132,8 @@ 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);
-            hideAboveAttachmentBarListLayout();
         }
         mOldAttachmentLoaderId = attachmentLoaderId;
 
@@ -176,25 +157,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener,
         setVisibility(mMessageHeaderItem.isExpanded() ? VISIBLE : GONE);
     }
 
-    private void hideAboveAttachmentBarListLayout() {
-        if (mAboveAttachmentBarListLayout != null) {
-            mAboveAttachmentBarListLayout.setVisibility(GONE);
-        }
-    }
-
-    private void showAboveAttachmentBarListLayout() {
-        if (mAboveAttachmentBarListLayout != null) {
-            final Conversation conversation = mMessageHeaderItem.getMessage().getConversation();
-            if (conversation == null) {
-                hideAboveAttachmentBarListLayout();
-                return;
-            }
-            AttachmentActionHandler.registerDismissListener(conversation.uri, mMessageFooterItem);
-            mAboveAttachmentBarListLayout.setVisibility(VISIBLE);
-            AttachmentActionHandler.setupAboveBarAttachmentLayout(mAboveAttachmentBarListLayout);
-        }
-    }
-
     private void renderAttachments(boolean loaderResult) {
         final List<Attachment> attachments;
         if (mAttachmentsCursor != null && !mAttachmentsCursor.isClosed()) {
@@ -241,8 +203,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener,
             return;
         }
 
-        mTitleText.setVisibility(View.VISIBLE);
-
         if (!tiledAttachments.isEmpty()) {
             renderTiledAttachments(tiledAttachments, loaderResult);
         }
@@ -262,14 +222,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener,
     private void renderBarAttachments(List<Attachment> barAttachments, boolean loaderResult) {
         mAttachmentBarList.setVisibility(View.VISIBLE);
 
-        if (!barAttachments.isEmpty() &&
-                AttachmentActionHandler.shouldShowAboveBarAttachmentLayout(
-                        getContext(), barAttachments)) {
-            showAboveAttachmentBarListLayout();
-        } else {
-            hideAboveAttachmentBarListLayout();
-        }
-
         final Account account = getAccount();
         for (Attachment attachment : barAttachments) {
             final Uri id = attachment.getIdentifierUri();
@@ -368,28 +320,4 @@ public class MessageFooterView extends LinearLayout implements DetachListener,
     private Account getAccount() {
         return mAccountController != null ? mAccountController.getAccount() : null;
     }
-
-    public void collapseAboveBarAttachmentsView() {
-        measureHeight();
-        mAboveAttachmentBarListLayout.setVisibility(View.GONE);
-        updateSpacerHeight();
-    }
-
-    private int measureHeight() {
-        ViewGroup parent = (ViewGroup) getParent();
-        if (parent == null) {
-            LogUtils.e(LOG_TAG, new Error(), "Unable to measure height of detached header");
-            return getHeight();
-        }
-        return Utils.measureViewHeight(this, parent);
-    }
-
-    private void updateSpacerHeight() {
-        final int h = measureHeight();
-
-        mMessageFooterItem.setHeight(h);
-        if (mCallbacks != null) {
-            mCallbacks.setMessageSpacerHeight(mMessageFooterItem, h);
-        }
-    }
 }