Section Inbox Teaser Update (Unified Email only)

UnifiedGmail update coming in soon to take care of rounded
corners and any other leftover UI changes for the section
inbox teaser.

Bug: 16570109
Change-Id: Ic4acda1f8dd0cd9916488551307d0b204f1219d8

5 files changed, 32 insertions, 28 deletions

diff --git a/res/layout/folder_teaser_item.xml b/res/layout/folder_teaser_item.xml
index 3e53301be..cf87214d1 100644
--- a/res/layout/folder_teaser_item.xml
+++ b/res/layout/folder_teaser_item.xml
@@ -15,15 +15,14 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/folder_teaser_item_background" >
+    android:layout_height="56dp"
+    android:background="@drawable/folder_teaser_item_background">
 
     <ImageView
         android:id="@+id/folder_imageView"
-        android:layout_width="48dp"
+        android:layout_width="24dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:background="@color/folder_teaser_icon_background"
         android:duplicateParentState="true"
         style="@style/FolderTeaserMarginStartStyle" />
 
@@ -33,11 +32,9 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
         android:duplicateParentState="true"
         android:orientation="vertical"
-        style="@style/FolderTeaserVerticalMarginStyle" >
+        style="@style/FolderTeaserLabelMarginStyle" >
 
         <TextView
             android:id="@+id/folder_textView"
@@ -45,7 +42,7 @@
             android:layout_height="wrap_content"
             android:duplicateParentState="true"
             android:includeFontPadding="false"
-            android:textColor="@color/teaser_main_text"
+            android:textColor="@color/folder_teaser_main_text"
             android:textSize="16sp"
             android:textStyle="bold"
             android:singleLine="true"
@@ -67,15 +64,12 @@
 
     <TextView
         android:id="@+id/count_textView"
-        android:layout_width="wrap_content"
-        android:layout_height="24sp"
+        android:layout_width="57dp"
+        android:layout_height="20dp"
         android:layout_gravity="center_vertical"
-        android:minWidth="@dimen/folder_teaser_count_textview_minwidth"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
         android:gravity="center"
         android:textColor="@color/folder_teaser_count_text"
-        android:textSize="16sp"
+        android:textSize="14sp"
         style="@style/FolderTeaserMarginEndStyle" />
 
 </LinearLayout>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 4a3b4d272..eb0f4a722 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -370,12 +370,17 @@
         <item name="android:layout_marginStart">@dimen/compose_header_btn_padding</item>
     </style>
 
-    <style name="FolderTeaserMarginStartStyle" parent="FolderTeaserVerticalMarginStyle">
-        <item name="android:layout_marginStart">@dimen/folder_teaser_horizontal_padding</item>
+    <style name="FolderTeaserLabelMarginStyle">
+        <item name="android:layout_marginStart">@dimen/folder_teaser_label_start_padding</item>
+        <item name="android:layout_marginEnd">@dimen/folder_teaser_label_end_padding</item>
     </style>
 
-    <style name="FolderTeaserMarginEndStyle" parent="FolderTeaserVerticalMarginStyle">
-        <item name="android:layout_marginEnd">@dimen/folder_teaser_horizontal_padding</item>
+    <style name="FolderTeaserMarginStartStyle">
+        <item name="android:layout_marginStart">@dimen/folder_teaser_start_padding</item>
+    </style>
+
+    <style name="FolderTeaserMarginEndStyle">
+        <item name="android:layout_marginEnd">@dimen/folder_teaser_end_padding</item>
     </style>
 
     <style name="ArrowStyle">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index badc661e0..577814c6d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -136,10 +136,12 @@
     <!-- The background color of the message header -->
     <color name="message_header_background_color">@android:color/white</color>
 
+    <!-- The color of the section name text in the folder teaser -->
+    <color name="folder_teaser_main_text">#212121</color>
     <!-- The color of the icon background in the teaser -->
     <color name="folder_teaser_icon_background">#eeeeee</color>
     <!-- The color of the senders text in the teaser -->
-    <color name="folder_teaser_senders_text">#58585b</color>
+    <color name="folder_teaser_senders_text">#757575</color>
     <!-- The color of the count text in the teaser -->
     <color name="folder_teaser_count_text">@android:color/black</color>
 
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 4b9f335f4..378097836 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -184,8 +184,11 @@
 
     <dimen name="compose_attachment_tile_text_end_padding">4dip</dimen>
 
-    <dimen name="folder_teaser_vertical_padding">8dip</dimen>
-    <dimen name="folder_teaser_horizontal_padding">16dip</dimen>
+    <dimen name="folder_teaser_start_padding">24dp</dimen>
+    <dimen name="folder_teaser_end_padding">16dp</dimen>
+
+    <dimen name="folder_teaser_label_start_padding">24dp</dimen>
+    <dimen name="folder_teaser_label_end_padding">16dp</dimen>
 
     <dimen name="teaser_arrow_margin_start">16dip</dimen>
     <dimen name="teaser_arrow_margin_end">12dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1afa22735..c1d751c82 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -984,17 +984,17 @@
         <item name="android:paddingRight">@dimen/compose_attachment_tile_text_end_padding</item>
     </style>
 
-    <style name="FolderTeaserVerticalMarginStyle">
-        <item name="android:layout_marginTop">@dimen/folder_teaser_vertical_padding</item>
-        <item name="android:layout_marginBottom">@dimen/folder_teaser_vertical_padding</item>
+    <style name="FolderTeaserLabelMarginStyle">
+        <item name="android:layout_marginLeft">@dimen/folder_teaser_label_start_padding</item>
+        <item name="android:layout_marginRight">@dimen/folder_teaser_label_end_padding</item>
     </style>
 
-    <style name="FolderTeaserMarginStartStyle" parent="FolderTeaserVerticalMarginStyle">
-        <item name="android:layout_marginLeft">@dimen/folder_teaser_horizontal_padding</item>
+    <style name="FolderTeaserMarginStartStyle">
+        <item name="android:layout_marginLeft">@dimen/folder_teaser_start_padding</item>
     </style>
 
-    <style name="FolderTeaserMarginEndStyle" parent="FolderTeaserVerticalMarginStyle">
-        <item name="android:layout_marginRight">@dimen/folder_teaser_horizontal_padding</item>
+    <style name="FolderTeaserMarginEndStyle">
+        <item name="android:layout_marginRight">@dimen/folder_teaser_end_padding</item>
     </style>
 
     <style name="ArrowStyle">