Merge "Update shadows for TL (Quantum) UnifiedEmail" into ub-gmail-ur14-dev

30 files changed, 15 insertions, 118 deletions

diff --git a/res/drawable-hdpi/ic_vertical_shadow_end_4dp.9.png b/res/drawable-hdpi/ic_vertical_shadow_end_4dp.9.png
new file mode 100644
index 000000000..88c72be2b
--- /dev/null
+++ b/res/drawable-hdpi/ic_vertical_shadow_end_4dp.9.png
diff --git a/res/drawable-hdpi/ic_vertical_shadow_start_6dp.9.png b/res/drawable-hdpi/ic_vertical_shadow_start_6dp.9.png
new file mode 100644
index 000000000..4d4f439b3
--- /dev/null
+++ b/res/drawable-hdpi/ic_vertical_shadow_start_6dp.9.png
diff --git a/res/drawable-ldrtl-hdpi/ic_vertical_shadow_end_4dp.9.png b/res/drawable-ldrtl-hdpi/ic_vertical_shadow_end_4dp.9.png
new file mode 100644
index 000000000..e119bad72
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_vertical_shadow_end_4dp.9.png
diff --git a/res/drawable-ldrtl-hdpi/ic_vertical_shadow_start_6dp.9.png b/res/drawable-ldrtl-hdpi/ic_vertical_shadow_start_6dp.9.png
new file mode 100644
index 000000000..1a47ee287
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_vertical_shadow_start_6dp.9.png
diff --git a/res/drawable-ldrtl-mdpi/ic_vertical_shadow_end_4dp.9.png b/res/drawable-ldrtl-mdpi/ic_vertical_shadow_end_4dp.9.png
new file mode 100644
index 000000000..c8fc1b3c3
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_vertical_shadow_end_4dp.9.png
diff --git a/res/drawable-ldrtl-mdpi/ic_vertical_shadow_start_6dp.9.png b/res/drawable-ldrtl-mdpi/ic_vertical_shadow_start_6dp.9.png
new file mode 100644
index 000000000..b4728bb1f
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_vertical_shadow_start_6dp.9.png
diff --git a/res/drawable-ldrtl-xhdpi/ic_vertical_shadow_end_4dp.9.png b/res/drawable-ldrtl-xhdpi/ic_vertical_shadow_end_4dp.9.png
new file mode 100644
index 000000000..9a7eb50c3
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_vertical_shadow_end_4dp.9.png
diff --git a/res/drawable-ldrtl-xhdpi/ic_vertical_shadow_start_6dp.9.png b/res/drawable-ldrtl-xhdpi/ic_vertical_shadow_start_6dp.9.png
new file mode 100644
index 000000000..3e5cf4a3c
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_vertical_shadow_start_6dp.9.png
diff --git a/res/drawable-ldrtl-xxhdpi/ic_vertical_shadow_end_4dp.9.png b/res/drawable-ldrtl-xxhdpi/ic_vertical_shadow_end_4dp.9.png
new file mode 100644
index 000000000..b781e2d89
--- /dev/null
+++ b/res/drawable-ldrtl-xxhdpi/ic_vertical_shadow_end_4dp.9.png
diff --git a/res/drawable-ldrtl-xxhdpi/ic_vertical_shadow_start_6dp.9.png b/res/drawable-ldrtl-xxhdpi/ic_vertical_shadow_start_6dp.9.png
new file mode 100644
index 000000000..1a8d69df5
--- /dev/null
+++ b/res/drawable-ldrtl-xxhdpi/ic_vertical_shadow_start_6dp.9.png
diff --git a/res/drawable-mdpi/ic_vertical_shadow_end_4dp.9.png b/res/drawable-mdpi/ic_vertical_shadow_end_4dp.9.png
new file mode 100644
index 000000000..ec1555c21
--- /dev/null
+++ b/res/drawable-mdpi/ic_vertical_shadow_end_4dp.9.png
diff --git a/res/drawable-mdpi/ic_vertical_shadow_start_6dp.9.png b/res/drawable-mdpi/ic_vertical_shadow_start_6dp.9.png
new file mode 100644
index 000000000..3239363d6
--- /dev/null
+++ b/res/drawable-mdpi/ic_vertical_shadow_start_6dp.9.png
diff --git a/res/drawable-v19/conversation_wide_unread_selector.xml b/res/drawable-v19/conversation_wide_unread_selector.xml
deleted file mode 100644
index 39de4ac5c..000000000
--- a/res/drawable-v19/conversation_wide_unread_selector.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2011 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true"
-          android:drawable="@drawable/list_conversation_wide_unread_focused_holo" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/list_conversation_wide_unread_pressed_holo" />
-    <item android:state_activated="true"
-          android:drawable="@drawable/list_conversation_wide_unread_pressed_holo" />
-    <item android:state_selected="true"
-          android:drawable="@drawable/list_conversation_wide_unread_selected_holo" />
-    <item android:drawable="@drawable/list_conversation_wide_unread_normal_holo" />
-</selector>
diff --git a/res/drawable-v21/conversation_item_background_ripple.xml b/res/drawable-v21/conversation_item_background_ripple.xml
index 2b336f9f9..f474b14db 100644
--- a/res/drawable-v21/conversation_item_background_ripple.xml
+++ b/res/drawable-v21/conversation_item_background_ripple.xml
@@ -16,6 +16,8 @@
     limitations under the License.
 -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/conversation_item_blue_background">
+    android:color="@color/conversation_item_blue_background">
+
     <item android:drawable="@android:color/white" />
+
 </ripple>
\ No newline at end of file
diff --git a/res/drawable-xhdpi/ic_vertical_shadow_end_4dp.9.png b/res/drawable-xhdpi/ic_vertical_shadow_end_4dp.9.png
new file mode 100644
index 000000000..2d100c0d4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_vertical_shadow_end_4dp.9.png
diff --git a/res/drawable-xhdpi/ic_vertical_shadow_start_6dp.9.png b/res/drawable-xhdpi/ic_vertical_shadow_start_6dp.9.png
new file mode 100644
index 000000000..0cff034f4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_vertical_shadow_start_6dp.9.png
diff --git a/res/drawable-xxhdpi/ic_vertical_shadow_end_4dp.9.png b/res/drawable-xxhdpi/ic_vertical_shadow_end_4dp.9.png
new file mode 100644
index 000000000..9edd16b55
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_vertical_shadow_end_4dp.9.png
diff --git a/res/drawable-xxhdpi/ic_vertical_shadow_start_6dp.9.png b/res/drawable-xxhdpi/ic_vertical_shadow_start_6dp.9.png
new file mode 100644
index 000000000..4aefadea9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_vertical_shadow_start_6dp.9.png
diff --git a/res/drawable-xxxhdpi/ic_vertical_shadow_end_4dp.9.png b/res/drawable-xxxhdpi/ic_vertical_shadow_end_4dp.9.png
new file mode 100644
index 000000000..33c93ee87
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_vertical_shadow_end_4dp.9.png
diff --git a/res/drawable-xxxhdpi/ic_vertical_shadow_start_6dp.9.png b/res/drawable-xxxhdpi/ic_vertical_shadow_start_6dp.9.png
new file mode 100644
index 000000000..f86d386f2
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_vertical_shadow_start_6dp.9.png
diff --git a/res/drawable/conversation_wide_unread_selector.xml b/res/drawable/conversation_wide_unread_selector.xml
deleted file mode 100644
index 39de4ac5c..000000000
--- a/res/drawable/conversation_wide_unread_selector.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2011 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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true"
-          android:drawable="@drawable/list_conversation_wide_unread_focused_holo" />
-    <item android:state_pressed="true"
-          android:drawable="@drawable/list_conversation_wide_unread_pressed_holo" />
-    <item android:state_activated="true"
-          android:drawable="@drawable/list_conversation_wide_unread_pressed_holo" />
-    <item android:state_selected="true"
-          android:drawable="@drawable/list_conversation_wide_unread_selected_holo" />
-    <item android:drawable="@drawable/list_conversation_wide_unread_normal_holo" />
-</selector>
diff --git a/res/layout/conversation_list.xml b/res/layout/conversation_list.xml
index a9eeb1823..70f9d1f94 100644
--- a/res/layout/conversation_list.xml
+++ b/res/layout/conversation_list.xml
@@ -19,7 +19,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/between_chrome"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/conversation_list_background_color">
 
     <com.android.mail.ui.MailSwipeRefreshLayout
         android:id="@+id/swipe_refresh_widget"
diff --git a/res/layout/conversation_list_footer_view.xml b/res/layout/conversation_list_footer_view.xml
index 2909cdb53..2238e13e2 100644
--- a/res/layout/conversation_list_footer_view.xml
+++ b/res/layout/conversation_list_footer_view.xml
@@ -22,7 +22,7 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white">
+    android:background="@drawable/conversation_item_background">
 
     <LinearLayout android:id="@+id/network_error"
         android:layout_width="match_parent"
diff --git a/res/layout/folder_teaser_item.xml b/res/layout/folder_teaser_item.xml
index e23bacc56..382894eb7 100644
--- a/res/layout/folder_teaser_item.xml
+++ b/res/layout/folder_teaser_item.xml
@@ -19,6 +19,7 @@
     android:orientation="vertical">
 
     <LinearLayout
+        android:id="@+id/folder_teaser_row"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="@dimen/folder_teaser_item_height"
diff --git a/res/layout/two_pane_activity.xml b/res/layout/two_pane_activity.xml
index 3b9ef3389..a2ca3b6a8 100644
--- a/res/layout/two_pane_activity.xml
+++ b/res/layout/two_pane_activity.xml
@@ -52,14 +52,14 @@
                 android:id="@+id/conversation_list_pane"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_gravity="left"
-                style="@style/TwoPaneConversationList" />
+                android:layout_gravity="left" />
 
             <com.android.mail.ui.ConversationViewFrame
                 android:id="@+id/conversation_pane"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_gravity="left">
+                android:layout_gravity="left"
+                android:foreground="@drawable/ic_vertical_shadow_end_4dp" >
 
                 <include layout="@layout/conversation_pager"
                     android:layout_width="match_parent"
@@ -71,7 +71,8 @@
                 android:id="@+id/miscellaneous_pane"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_gravity="left" />
+                android:layout_gravity="left"
+                android:foreground="@drawable/ic_vertical_shadow_end_4dp" />
 
             <include layout="@layout/floating_actions" />
 
diff --git a/res/values-ldrtl-sw600dp-port/styles.xml b/res/values-ldrtl-sw600dp-port/styles.xml
deleted file mode 100644
index 0a988d8f5..000000000
--- a/res/values-ldrtl-sw600dp-port/styles.xml
+++ /dev/null
@@ -1,23 +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.
--->
-
-<resources>
-    <style name="TwoPaneConversationList">
-        <item name="android:paddingEnd">@dimen/two_pane_tl_side</item>
-    </style>
-</resources>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
deleted file mode 100644
index 29016fa8d..000000000
--- a/res/values-sw600dp-port/styles.xml
+++ /dev/null
@@ -1,30 +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.
--->
-
-<resources>
-    <style name="TwoPaneConversationList">
-        <item name="android:paddingRight">@dimen/two_pane_tl_side</item>
-    </style>
-
-    <style name="ConversationListFade" parent="@style/ConversationListFadeBase">
-        <item name="android:paddingTop">@dimen/two_pane_tl_top</item>
-        <item name="android:paddingBottom">@dimen/two_pane_tl_top</item>
-        <item name="android:clipToPadding">false</item>
-        <item name="android:divider">@null</item>
-    </style>
-</resources>
diff --git a/res/values-sw600dp/colors.xml b/res/values-sw600dp/colors.xml
index bf545aa17..6a4e517c4 100644
--- a/res/values-sw600dp/colors.xml
+++ b/res/values-sw600dp/colors.xml
@@ -2,4 +2,6 @@
 <resources>
     <color name="folder_list_divider_color">#b2b2b2</color>
     <color name="mail_activity_status_bar_color">@color/primary_dark_color</color>
+    <color name="loading_messages_background_color">@android:color/white</color>
+    <color name="conversation_list_background_color">@android:color/white</color>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index afbf7c85c..d2b0d594d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -174,4 +174,5 @@
     <color name="snack_bar_action_text_color">#f4b400</color>
 
     <color name="conversation_item_blue_background">#ccf2f7</color>
+    <color name="conversation_list_background_color">@android:color/transparent</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 12a0d1805..4c4709f45 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -453,8 +453,6 @@
     <style name="NotificationSecondaryText">
     </style>
 
-    <style name="TwoPaneConversationList" />
-
     <style name="AttachmentButtonStyle">
         <item name="android:clickable">true</item>
         <item name="android:layout_width">48dip</item>