commit 0a2942d475b784a4d775887357d5a2980eccc8d6
author Andrew Sapperstein <asapperstein@google.com> Fri Jun 15 17:02:16 2012 -0700
committer Andrew Sapperstein <asapperstein@google.com> Fri Jun 15 18:29:10 2012 -0700
tree 6121665405e9ccb1d9004f4af08618b2c6740d67
parent beaf185977cc7f33bfc59240a1fb63cf72ac14e4

Making grid in compose match redlines.

Change-Id: I6a0389b222c02866f76392b28d1431e807a1ac3f

res/layout/compose.xml

diff --git a/res/layout/compose.xml b/res/layout/compose.xml
index acbdc1f..817f7cd 100644
--- a/res/layout/compose.xml
+++ b/res/layout/compose.xml
@@ -53,14 +53,15 @@
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:orientation="vertical"
-                android:paddingTop="2dip"
+                android:paddingTop="8dip"
                 android:paddingRight="5dip"
                 android:paddingBottom="0dip"
                 android:paddingLeft="5dip">
                 <com.android.mail.ui.AttachmentTileGrid
                     android:id="@+id/attachment_tile_grid"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dip" />
                 <LinearLayout
                     android:id="@+id/attachment_bar_list"
                     android:layout_height="wrap_content"

res/layout/compose_attachment_tile.xml

diff --git a/res/layout/compose_attachment_tile.xml b/res/layout/compose_attachment_tile.xml
index 4ee830d..334b2ba 100644
--- a/res/layout/compose_attachment_tile.xml
+++ b/res/layout/compose_attachment_tile.xml
@@ -31,20 +31,17 @@
     <View
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
-        android:layout_width="48dip"
-        android:layout_height="48dip"
-        android:background="@color/black_semi_transparent" />
+        android:layout_width="44dip"
+        android:layout_height="44dip"
+        android:background="@color/attachment_tile_shadow_box_color" />
     <ImageButton
         android:id="@+id/attachment_tile_close_button"
         android:src="@drawable/ic_cancel_holo_light"
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
-        android:layout_width="48dip"
-        android:layout_height="48dip"
-        android:paddingTop="12dip"
-        android:paddingRight="12dip"
-        android:paddingBottom="12dip"
-        android:paddingLeft="12dip"
+        android:layout_width="44dip"
+        android:layout_height="44dip"
+        android:gravity="center"
         android:focusable="true"
         android:background="?android:attr/selectableItemBackground" />
 

res/values/colors.xml

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 77fd91d..3f71f9a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -44,7 +44,6 @@
     <!-- Must match the quoted_text_background_color_string -->
     <color name="compose_background_color">#ebebeb</color>
     <string name="quoted_text_font_color_string" translatable="false">#777777</string>
-    <color name="black_semi_transparent">#77000000</color>
 
     <color name="conv_header_add_label_text">@android:color/black</color>
     <color name="conv_header_add_label_background">#eeeeee</color>