CV divider tweaks. Fixes b/16880210.

Also tweaks some padding for CV attachments.

Change-Id: Ic364f012ed35773681f884c8402e19f16f5bca22

7 files changed, 11 insertions, 9 deletions

diff --git a/res/layout/conversation_message_footer.xml b/res/layout/conversation_message_footer.xml
index 1e0c6d1c4..819d6ea71 100644
--- a/res/layout/conversation_message_footer.xml
+++ b/res/layout/conversation_message_footer.xml
@@ -41,7 +41,7 @@
         android:id="@+id/attachment_tile_grid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
+        android:layout_marginBottom="4dp"
         android:visibility="gone"
         style="@style/AttachmentMarginStyle" />
 
diff --git a/res/layout/conversation_view_border.xml b/res/layout/conversation_view_border.xml
index 89ec42777..b2df1ba3b 100644
--- a/res/layout/conversation_view_border.xml
+++ b/res/layout/conversation_view_border.xml
@@ -18,7 +18,7 @@
 <View xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/border"
     android:layout_width="match_parent"
-    android:layout_height="1dp"
+    android:layout_height="@dimen/divider_height"
     android:layout_marginLeft="@dimen/conversation_border_margin_side"
     android:layout_marginRight="@dimen/conversation_border_margin_side"
-    android:background="@color/conversation_view_border_color" />
\ No newline at end of file
+    android:background="@color/conversation_view_border_color" />
diff --git a/res/layout/drawer_footer_item.xml b/res/layout/drawer_footer_item.xml
index 16b6ee07b..9e003fc94 100644
--- a/res/layout/drawer_footer_item.xml
+++ b/res/layout/drawer_footer_item.xml
@@ -25,7 +25,7 @@
     <View
         android:id="@+id/top_border"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/drawer_item_divider_thickness"
+        android:layout_height="@dimen/divider_height"
         android:background="@color/divider_color"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp" />
diff --git a/res/layout/folder_list_header.xml b/res/layout/folder_list_header.xml
index 935e80cf6..584f7cc4a 100644
--- a/res/layout/folder_list_header.xml
+++ b/res/layout/folder_list_header.xml
@@ -25,7 +25,7 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1px"
+        android:layout_height="@dimen/divider_height"
         android:layout_marginTop="8dp"
         android:background="@color/divider_color" />
 
diff --git a/res/values/colors.xml b/res/values/colors.xml
index bcbd24e05..490c27d20 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,7 +28,7 @@
     <!-- if you want to make something blue, please try to use THIS blue -->
     <color name="mail_app_blue">@android:color/holo_blue_light</color>
     <color name="tablet_background_gray">#eeeeee</color>
-    <color name="divider_color">#b2b2b2</color>
+    <color name="divider_color">#e5e5e5</color>
 
     <!-- Conversation List Item Colors -->
     <color name="senders_text_color">@color/text_color_black</color>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 4a1a34ae3..f847acb0e 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -29,7 +29,7 @@
     <dimen name="folders_text_bottom_padding">4dip</dimen>
     <dimen name="attachment_tile_min_size">120dp</dimen>
     <dimen name="attachment_tile_max_size">164dp</dimen>
-    <dimen name="attachment_tile_padding">12dp</dimen>
+    <dimen name="attachment_tile_padding">8dp</dimen>
     <dimen name="compose_scrollview_max_width">768dp</dimen>
     <dimen name="color_block_width">32dip</dimen>
     <dimen name="color_block_height">6dip</dimen>
@@ -98,7 +98,6 @@
     <dimen name="drawer_footer_item_padding">16dp</dimen>
     <dimen name="drawer_footer_text_padding_start">16dp</dimen>
     <dimen name="drawer_footer_item_minimum_height">48dp</dimen>
-    <dimen name="drawer_item_divider_thickness">1px</dimen>
     <dimen name="drawer_item_font_size">16sp</dimen>
     <dimen name="widget_subject_font_size">13sp</dimen>
     <dimen name="widget_date_font_size">12sp</dimen>
@@ -217,4 +216,7 @@
     <dimen name="compose_content_end_padding">16dp</dimen>
 
     <dimen name="chip_wrapper_start_padding">72dp</dimen>
+
+    <!-- Standard height for all dividers -->
+    <dimen name="divider_height">0.5dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cf6178b8b..30789a66f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -70,7 +70,7 @@
 
     <style name="RecipientComposeFieldSpacer">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1px</item>
+        <item name="android:layout_height">@dimen/divider_height</item>
         <item name="android:background">@color/compose_divider_color</item>
     </style>