Merge changes I612bb54c,I611f0f7e into ub-gmail-ur14-dev

* changes:
  CV attachments. b/16138036.
  Remove above attachment promo. b/16138036.

3 files changed, 2 insertions, 32 deletions

diff --git a/res/layout/above_attachment_bar_list_layout.xml b/res/layout/above_attachment_bar_list_layout.xml
deleted file mode 100644
index a0bd285b2..000000000
--- a/res/layout/above_attachment_bar_list_layout.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 Google Inc.
-     Licensed to The Android Open Source Project.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<merge />
\ No newline at end of file
diff --git a/res/layout/conversation_message_attachment_bar.xml b/res/layout/conversation_message_attachment_bar.xml
index 2e7da428d..4fe12c0bd 100644
--- a/res/layout/conversation_message_attachment_bar.xml
+++ b/res/layout/conversation_message_attachment_bar.xml
@@ -18,7 +18,7 @@
 <com.android.mail.browse.MessageAttachmentBar xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="8dip"
+    android:layout_marginBottom="12dp"
     android:background="@drawable/attachment_bg_holo"
     android:minHeight="48dip" >
 
diff --git a/res/layout/conversation_message_footer.xml b/res/layout/conversation_message_footer.xml
index c2575902f..1e0c6d1c4 100644
--- a/res/layout/conversation_message_footer.xml
+++ b/res/layout/conversation_message_footer.xml
@@ -37,26 +37,14 @@
         android:textSize="14sp"
         android:visibility="gone" />
 
-    <TextView
-        android:id="@+id/attachments_header_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:text="@string/attachments_header"
-        android:visibility="gone"
-        style="@style/MessageAttachmentsHeaderStyle" />
-
     <com.android.mail.ui.AttachmentTileGrid
         android:id="@+id/attachment_tile_grid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
         android:visibility="gone"
         style="@style/AttachmentMarginStyle" />
 
-    <include
-        layout="@layout/above_attachment_bar_list_layout"
-        android:id="@+id/above_attachment_bar_list_layout"/>
-
     <LinearLayout
         android:id="@+id/attachment_bar_list"
         android:layout_width="match_parent"