Quantum CV - drafts. b/16138121

New assets, new red color for drafts.
Super-collapsed becomes red when there's a draft.
Conversation footer is hidden when last message is a draft.

Change-Id: I89a58971a19475be79f56cae53934f3c7b2ab894
Missing: properly re-sizing the footer.

25 files changed, 31 insertions, 9 deletions

diff --git a/res/drawable-hdpi/ic_draft.png b/res/drawable-hdpi/ic_draft.png
deleted file mode 100644
index a0fa5cebf..000000000
--- a/res/drawable-hdpi/ic_draft.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_drafts_wht_24dp.png b/res/drawable-hdpi/ic_drafts_wht_24dp.png
new file mode 100644
index 000000000..2d27488a4
--- /dev/null
+++ b/res/drawable-hdpi/ic_drafts_wht_24dp.png
diff --git a/res/drawable-hdpi/ic_edit_24dp.png b/res/drawable-hdpi/ic_edit_24dp.png
new file mode 100644
index 000000000..854bc54da
--- /dev/null
+++ b/res/drawable-hdpi/ic_edit_24dp.png
diff --git a/res/drawable-hdpi/ic_edit_holo_light.png b/res/drawable-hdpi/ic_edit_holo_light.png
deleted file mode 100644
index 75141ab78..000000000
--- a/res/drawable-hdpi/ic_edit_holo_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_draft.png b/res/drawable-mdpi/ic_draft.png
deleted file mode 100644
index 0336fe736..000000000
--- a/res/drawable-mdpi/ic_draft.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_drafts_wht_24dp.png b/res/drawable-mdpi/ic_drafts_wht_24dp.png
new file mode 100644
index 000000000..4d54b082f
--- /dev/null
+++ b/res/drawable-mdpi/ic_drafts_wht_24dp.png
diff --git a/res/drawable-mdpi/ic_edit_24dp.png b/res/drawable-mdpi/ic_edit_24dp.png
new file mode 100644
index 000000000..315f28685
--- /dev/null
+++ b/res/drawable-mdpi/ic_edit_24dp.png
diff --git a/res/drawable-mdpi/ic_edit_holo_light.png b/res/drawable-mdpi/ic_edit_holo_light.png
deleted file mode 100644
index d344424b0..000000000
--- a/res/drawable-mdpi/ic_edit_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_draft.png b/res/drawable-xhdpi/ic_draft.png
deleted file mode 100644
index 2ec98990d..000000000
--- a/res/drawable-xhdpi/ic_draft.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_drafts_wht_24dp.png b/res/drawable-xhdpi/ic_drafts_wht_24dp.png
new file mode 100644
index 000000000..a06fc2dfa
--- /dev/null
+++ b/res/drawable-xhdpi/ic_drafts_wht_24dp.png
diff --git a/res/drawable-xhdpi/ic_edit_24dp.png b/res/drawable-xhdpi/ic_edit_24dp.png
new file mode 100644
index 000000000..da4f769cb
--- /dev/null
+++ b/res/drawable-xhdpi/ic_edit_24dp.png
diff --git a/res/drawable-xhdpi/ic_edit_holo_light.png b/res/drawable-xhdpi/ic_edit_holo_light.png
deleted file mode 100644
index 88c7fc9ca..000000000
--- a/res/drawable-xhdpi/ic_edit_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_draft.png b/res/drawable-xxhdpi/ic_draft.png
deleted file mode 100644
index 576e4347f..000000000
--- a/res/drawable-xxhdpi/ic_draft.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_drafts_wht_24dp.png b/res/drawable-xxhdpi/ic_drafts_wht_24dp.png
new file mode 100644
index 000000000..f5addffa8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_drafts_wht_24dp.png
diff --git a/res/drawable-xxhdpi/ic_edit_24dp.png b/res/drawable-xxhdpi/ic_edit_24dp.png
new file mode 100644
index 000000000..142e8135a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_edit_24dp.png
diff --git a/res/drawable-xxhdpi/ic_edit_holo_light.png b/res/drawable-xxhdpi/ic_edit_holo_light.png
deleted file mode 100644
index 41ccb3ec6..000000000
--- a/res/drawable-xxhdpi/ic_edit_holo_light.png
+++ /dev/null
diff --git a/res/drawable/draft_background_circle.xml b/res/drawable/draft_background_circle.xml
new file mode 100644
index 000000000..92ba6f5ed
--- /dev/null
+++ b/res/drawable/draft_background_circle.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/light_gray" />
+</shape>
\ No newline at end of file
diff --git a/res/layout-v19/conversation_message_upper_header_actions_land_or_tablet.xml b/res/layout-v19/conversation_message_upper_header_actions_land_or_tablet.xml
index 479712736..165ff77fc 100644
--- a/res/layout-v19/conversation_message_upper_header_actions_land_or_tablet.xml
+++ b/res/layout-v19/conversation_message_upper_header_actions_land_or_tablet.xml
@@ -20,7 +20,7 @@
         android:id="@+id/edit_draft"
         style="@style/MessageHeaderActionButtonStyle"
         android:visibility="gone"
-        android:src="@drawable/ic_edit_holo_light"
+        android:src="@drawable/ic_edit_24dp"
         android:contentDescription="@string/resume_draft" />
     <ImageView
         android:id="@+id/reply"
diff --git a/res/layout/conversation_footer.xml b/res/layout/conversation_footer.xml
index 25c970eb1..49b3e2bc0 100644
--- a/res/layout/conversation_footer.xml
+++ b/res/layout/conversation_footer.xml
@@ -28,6 +28,7 @@
         android:background="@color/conversation_view_border_color"/>
 
     <LinearLayout
+        android:id="@+id/footer_buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
 
diff --git a/res/layout/conversation_message_upper_header.xml b/res/layout/conversation_message_upper_header.xml
index a57b8188d..5422851ee 100644
--- a/res/layout/conversation_message_upper_header.xml
+++ b/res/layout/conversation_message_upper_header.xml
@@ -46,9 +46,10 @@
         android:layout_height="@dimen/contact_image_height"
         android:layout_marginTop="@dimen/message_header_contact_photo_margin"
         android:layout_marginBottom="@dimen/message_header_contact_photo_margin"
-        android:visibility="gone"
+        android:background="@drawable/draft_background_circle"
         android:scaleType="center"
-        android:src="@drawable/ic_draft"
+        android:src="@drawable/ic_drafts_wht_24dp"
+        android:visibility="gone"
         style="@style/ConversationViewMarginStyle" />
     <include layout="@layout/conversation_message_upper_header_text" />
     <include layout="@layout/conversation_message_upper_header_actions" />
diff --git a/res/layout/conversation_message_upper_header_actions.xml b/res/layout/conversation_message_upper_header_actions.xml
index d5a04c040..ab98ec3ec 100644
--- a/res/layout/conversation_message_upper_header_actions.xml
+++ b/res/layout/conversation_message_upper_header_actions.xml
@@ -20,7 +20,7 @@
         android:id="@+id/edit_draft"
         style="@style/MessageHeaderActionButtonStyle"
         android:visibility="gone"
-        android:src="@drawable/ic_edit_holo_light"
+        android:src="@drawable/ic_edit_24dp"
         android:contentDescription="@string/resume_draft" />
     <ImageView
         android:id="@+id/reply"
diff --git a/res/layout/conversation_message_upper_header_actions_land_or_tablet.xml b/res/layout/conversation_message_upper_header_actions_land_or_tablet.xml
index d42c0f2f7..e9ab53c5e 100644
--- a/res/layout/conversation_message_upper_header_actions_land_or_tablet.xml
+++ b/res/layout/conversation_message_upper_header_actions_land_or_tablet.xml
@@ -20,7 +20,7 @@
         android:id="@+id/edit_draft"
         style="@style/MessageHeaderActionButtonStyle"
         android:visibility="gone"
-        android:src="@drawable/ic_edit_holo_light"
+        android:src="@drawable/ic_edit_24dp"
         android:contentDescription="@string/resume_draft" />
     <ImageView
         android:id="@+id/reply"
diff --git a/res/layout/super_collapsed_block.xml b/res/layout/super_collapsed_block.xml
index a0995a36d..f686ef9b3 100644
--- a/res/layout/super_collapsed_block.xml
+++ b/res/layout/super_collapsed_block.xml
@@ -50,7 +50,6 @@
         android:background="@drawable/super_collapse_circle"
         android:contentDescription="@null"
         android:gravity="center"
-        android:textSize="@dimen/super_collapsed_text_size"
-        android:textColor="@color/conversation_view_text_color_light" />
+        android:textSize="@dimen/super_collapsed_text_size" />
 
 </com.android.mail.browse.SuperCollapsedBlock>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 8a060db8d..77c97616b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,6 +20,7 @@
     <color name="text_color_black">#212121</color>
     <color name="accent_blue">#00bfd8</color>
     <color name="text_color_blue">@color/accent_blue</color>
+    <color name="text_color_draft_red">#da4336</color>
     <color name="gray_text_color">#777777</color>
     <color name="dark_gray_text_color">#58585b</color>
     <color name="light_gray">#cccccc</color>
@@ -36,7 +37,6 @@
     <color name="ap_overflow_badge_color">#cceeeeee</color>
     <color name="ap_overflow_text_color">#ff4f4c4c</color>
 
-    <color name="drafts">#ff990000</color>
     <color name="attachment_bg_color">#ffdddddd</color>
     <color name="swiped_bg_color">#ff999999</color>
     <color name="holo_light_background_color">#ffe8e8e8</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f20f6655d..8fdc31d6d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -531,7 +531,7 @@
     </style>
 
     <style name="DraftTextAppearance">
-        <item name="android:textColor">@color/drafts</item>
+        <item name="android:textColor">@color/text_color_draft_red</item>
     </style>
 
     <style name="SendingTextAppearance" parent="@style/DraftTextAppearance">