12 files changed, 37 insertions, 29 deletions
diff --git a/res/drawable-hdpi/ic_attach_file.png b/res/drawable-hdpi/ic_attach_file.png
deleted file mode 100644
index 7479681cb..000000000
--- a/res/drawable-hdpi/ic_attach_file.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_attach_file.png b/res/drawable-mdpi/ic_attach_file.png
deleted file mode 100644
index 772fcddd4..000000000
--- a/res/drawable-mdpi/ic_attach_file.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_attach_file.png b/res/drawable-xhdpi/ic_attach_file.png
deleted file mode 100644
index b9264070f..000000000
--- a/res/drawable-xhdpi/ic_attach_file.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_attach_file.png b/res/drawable-xxhdpi/ic_attach_file.png
deleted file mode 100644
index 2a193df19..000000000
--- a/res/drawable-xxhdpi/ic_attach_file.png
+++ /dev/null
diff --git a/res/layout/single_folders_view.xml b/res/layout/single_folders_view.xml
index 3f048da01..ebb4adb9d 100644
--- a/res/layout/single_folders_view.xml
+++ b/res/layout/single_folders_view.xml
@@ -19,19 +19,25 @@
 
 <!-- Describes an individual toggleable folder entry to be displayed in a list of folders in
      a folder selection UI. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/folders"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/single_folder_list_item_height"
+    android:layout_gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
     <!-- Note: the checkbox is not focusable because the parent list item itself handles
          the toggling -->
-    <TextView android:id="@+id/folder_name"
-        style="@style/FolderSelectionItemStyle" />
+    <ImageView
+        android:id="@+id/folder_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center_vertical"
+        style="@style/SingleFolderListIconStyle" />
 
-    <View
-        android:id="@+id/color_block"
-        style="@style/FolderColorBoxStyle" />
+    <TextView android:id="@+id/folder_name"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        style="@style/SingleFolderSelectionItemStyle" />
 
-</FrameLayout>
+</LinearLayout>
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index c671a8649..cd6897d82 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -83,7 +83,7 @@
         android:layout_weight="1"
         android:cacheColorHint="#00000000"
         android:background="@drawable/gradient_bg_widget_holo"
-        style="@style/ConversationListFade" />
+        style="@style/WidgetConversationListFade" />
     <TextView
         android:id="@+id/empty_conversation_list"
         android:layout_width="match_parent"
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index a6b45b1c9..96b541093 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -200,6 +200,10 @@
         <item name="android:paddingEnd">@dimen/snack_bar_margin_horizontal</item>
     </style>
 
+    <style name="SingleFolderListIconStyle">
+        <item name="android:layout_marginStart">@dimen/single_folder_list_item_start_margin</item>
+    </style>
+
     <style name="FolderSelectionItemStyle" parent="AbstractFolderSelectionItemStyle">
         <item name="android:layout_marginStart">@dimen/folder_selection_margin_start</item>
         <item name="android:layout_marginEnd">@dimen/folder_selection_margin_end</item>
diff --git a/res/values-v19/drawables.xml b/res/values-v19/drawables.xml
deleted file mode 100644
index 17f03bfda..000000000
--- a/res/values-v19/drawables.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2013 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.
--->
-<resources>
-    <drawable name="ic_attach">@drawable/ic_attach_file</drawable>
-</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ffb2939c5..36676c9bf 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -82,6 +82,7 @@
 
     <!-- Widget colors -->
     <color name="widget_header_bg_color">#da4336</color>
+    <color name="widget_conversation_list_divider_color">#e5e5e5</color>
 
     <!--  Color of the semi-transparent shadow box on attachment tiles -->
     <color name="attachment_tile_shadow_box_color">#7F000000</color>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index e8496497d..d664e8bc1 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -88,6 +88,9 @@
     <dimen name="folder_list_item_start_margin">16dp</dimen>
     <dimen name="folder_list_item_text_start_margin">32dp</dimen>
     <dimen name="folder_list_item_end_margin">8dp</dimen>
+    <dimen name="single_folder_list_item_height">48sp</dimen>
+    <dimen name="single_folder_list_item_start_margin">24dp</dimen>
+    <dimen name="single_folder_list_item_padding">0dp</dimen>
     <!-- Let's try to keep this consistent with color_block_height above, unless there's a good reason not to. -->
     <dimen name="folder_swatch_height">6dip</dimen>
     <dimen name="folder_list_popup_width">200dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 67af422b0..2fd809c0a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -56,6 +56,8 @@
     <string name="discard">Discard</string>
     <!-- The possible ways to reply to a message [CHAR LIMIT=15] -->
     <string name="compose">Compose</string>
+    <!-- The action bar title for  the default compose mode [CHAR LIMIT=10] -->
+    <string name="compose_title">Compose</string>
     <!-- The possible ways to reply to a message [CHAR LIMIT=15] -->
     <string-array name="compose_modes">
         <!-- Reply -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2050472c6..d4d25a61f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -221,6 +221,10 @@
     <style name="ConversationListFade" parent="@style/ConversationListFadeBase">
         <item name="android:divider">@null</item>
     </style>
+    <style name="WidgetConversationListFade" parent="@style/ConversationListFadeBase">
+        <item name="android:divider">@color/widget_conversation_list_divider_color</item>
+        <item name="android:dividerHeight">@dimen/divider_height</item>
+    </style>
     <!-- End browse list item styles -->
 
     <style name="AbstractFloatingActionButtonStyle">
@@ -417,6 +421,10 @@
         <item name="android:layout_marginRight">@dimen/folder_selection_margin_end</item>
     </style>
 
+    <style name="SingleFolderSelectionItemStyle" parent="FolderSelectionItemStyle">
+         <item name="android:padding">@dimen/single_folder_list_item_padding</item>
+    </style>
+
     <!-- Widget styles -->
     <style name="WidgetTitle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:singleLine">true</item>
@@ -606,6 +614,10 @@
         <item name="android:paddingRight">20dp</item>
     </style>
 
+    <style name="SingleFolderListIconStyle">
+        <item name="android:layout_marginLeft">@dimen/single_folder_list_item_start_margin</item>
+    </style>
+
     <style name="FolderListItemStartStyle">
         <item name="android:layout_marginLeft">@dimen/folder_list_item_text_start_margin</item>
     </style>