Updated conversation header for quantum CV.

b/15595931

Using a combination of breaking and non-breaking spaces
to ensure that labels start on a new line if they don't
all fit in the remaining space of the first line they can
be drawn on.

Starring works now.
Can click the labels to open change labels again.
Priority indicator is now baseline aligned.
Properly drawing the label chips.
Label chips moved up to the baseline
RTL support.
New star asset.

Change-Id: Ife32339f174bff7beafc979f9cc9761cefffed72

38 files changed, 67 insertions, 69 deletions

diff --git a/res/drawable-hdpi/ic_btn_star_off.png b/res/drawable-hdpi/ic_btn_star_off.png
deleted file mode 100644
index 85481fe72..000000000
--- a/res/drawable-hdpi/ic_btn_star_off.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_btn_star_on.png b/res/drawable-hdpi/ic_btn_star_on.png
deleted file mode 100644
index 4654ef5f3..000000000
--- a/res/drawable-hdpi/ic_btn_star_on.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_star_20dp.png b/res/drawable-hdpi/ic_star_20dp.png
new file mode 100644
index 000000000..1d79f9ced
--- /dev/null
+++ b/res/drawable-hdpi/ic_star_20dp.png
diff --git a/res/drawable-hdpi/ic_star_off_convo_view_holo_light.png b/res/drawable-hdpi/ic_star_off_convo_view_holo_light.png
deleted file mode 100644
index c1196570e..000000000
--- a/res/drawable-hdpi/ic_star_off_convo_view_holo_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_star_on_convo_view_holo_light.png b/res/drawable-hdpi/ic_star_on_convo_view_holo_light.png
deleted file mode 100644
index d18010732..000000000
--- a/res/drawable-hdpi/ic_star_on_convo_view_holo_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_star_outline_20dp.png b/res/drawable-hdpi/ic_star_outline_20dp.png
new file mode 100644
index 000000000..3d8fe399c
--- /dev/null
+++ b/res/drawable-hdpi/ic_star_outline_20dp.png
diff --git a/res/drawable-mdpi/ic_btn_star_off.png b/res/drawable-mdpi/ic_btn_star_off.png
deleted file mode 100644
index 0add19af1..000000000
--- a/res/drawable-mdpi/ic_btn_star_off.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_btn_star_on.png b/res/drawable-mdpi/ic_btn_star_on.png
deleted file mode 100644
index 54a4230ce..000000000
--- a/res/drawable-mdpi/ic_btn_star_on.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_star_20dp.png b/res/drawable-mdpi/ic_star_20dp.png
new file mode 100644
index 000000000..79048fd83
--- /dev/null
+++ b/res/drawable-mdpi/ic_star_20dp.png
diff --git a/res/drawable-mdpi/ic_star_off_convo_view_holo_light.png b/res/drawable-mdpi/ic_star_off_convo_view_holo_light.png
deleted file mode 100644
index 1b63df69b..000000000
--- a/res/drawable-mdpi/ic_star_off_convo_view_holo_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_star_on_convo_view_holo_light.png b/res/drawable-mdpi/ic_star_on_convo_view_holo_light.png
deleted file mode 100644
index 32d878e40..000000000
--- a/res/drawable-mdpi/ic_star_on_convo_view_holo_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_star_outline_20dp.png b/res/drawable-mdpi/ic_star_outline_20dp.png
new file mode 100644
index 000000000..046eca998
--- /dev/null
+++ b/res/drawable-mdpi/ic_star_outline_20dp.png
diff --git a/res/drawable-xhdpi/ic_btn_star_off.png b/res/drawable-xhdpi/ic_btn_star_off.png
deleted file mode 100644
index eb5cbe242..000000000
--- a/res/drawable-xhdpi/ic_btn_star_off.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_btn_star_on.png b/res/drawable-xhdpi/ic_btn_star_on.png
deleted file mode 100644
index 9751701ac..000000000
--- a/res/drawable-xhdpi/ic_btn_star_on.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_star_20dp.png b/res/drawable-xhdpi/ic_star_20dp.png
new file mode 100644
index 000000000..0a3864a25
--- /dev/null
+++ b/res/drawable-xhdpi/ic_star_20dp.png
diff --git a/res/drawable-xhdpi/ic_star_off_convo_view_holo_light.png b/res/drawable-xhdpi/ic_star_off_convo_view_holo_light.png
deleted file mode 100644
index a40138366..000000000
--- a/res/drawable-xhdpi/ic_star_off_convo_view_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_star_on_convo_view_holo_light.png b/res/drawable-xhdpi/ic_star_on_convo_view_holo_light.png
deleted file mode 100644
index a3a39d267..000000000
--- a/res/drawable-xhdpi/ic_star_on_convo_view_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_star_outline_20dp.png b/res/drawable-xhdpi/ic_star_outline_20dp.png
new file mode 100644
index 000000000..782b9f33e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_star_outline_20dp.png
diff --git a/res/drawable-xxhdpi/ic_btn_star_off.png b/res/drawable-xxhdpi/ic_btn_star_off.png
deleted file mode 100644
index b1b247727..000000000
--- a/res/drawable-xxhdpi/ic_btn_star_off.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_btn_star_on.png b/res/drawable-xxhdpi/ic_btn_star_on.png
deleted file mode 100644
index c26b52025..000000000
--- a/res/drawable-xxhdpi/ic_btn_star_on.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_star_20dp.png b/res/drawable-xxhdpi/ic_star_20dp.png
new file mode 100644
index 000000000..70d38ea2a
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_star_20dp.png
diff --git a/res/drawable-xxhdpi/ic_star_off_convo_view_holo_light.png b/res/drawable-xxhdpi/ic_star_off_convo_view_holo_light.png
deleted file mode 100644
index 7eab36f1a..000000000
--- a/res/drawable-xxhdpi/ic_star_off_convo_view_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_star_on_convo_view_holo_light.png b/res/drawable-xxhdpi/ic_star_on_convo_view_holo_light.png
deleted file mode 100644
index cc97b1e15..000000000
--- a/res/drawable-xxhdpi/ic_star_on_convo_view_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_star_outline_20dp.png b/res/drawable-xxhdpi/ic_star_outline_20dp.png
new file mode 100644
index 000000000..f74a7d7aa
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_star_outline_20dp.png
diff --git a/res/drawable/message_header_star.xml b/res/drawable/star.xml
index 9e71e1c4a..89a2eb01b 100644
--- a/res/drawable/message_header_star.xml
+++ b/res/drawable/star.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2011 Google Inc.
+     Copyright (C) 2014 Google Inc.
      Licensed to The Android Open Source Project.
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,8 @@
      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_selected="true"
-          android:drawable="@drawable/ic_star_on_convo_view_holo_light" />
-    <item android:drawable="@drawable/ic_star_off_convo_view_holo_light" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item app:state_starred="true" android:drawable="@drawable/ic_star_20dp" />
+    <item android:drawable="@drawable/ic_star_outline_20dp" />
 </selector>
diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml
index f1f24aefd..2f774f945 100644
--- a/res/layout/conversation_item_view_normal.xml
+++ b/res/layout/conversation_item_view_normal.xml
@@ -153,7 +153,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="-1dp"
-                    android:src="@drawable/ic_btn_star_off"
+                    android:src="@drawable/ic_star_outline_20dp"
                     style="@style/ConversationListStarStyle" />
 
             </LinearLayout>
diff --git a/res/layout/conversation_item_view_normal_spacious.xml b/res/layout/conversation_item_view_normal_spacious.xml
index c93d41d95..8f1e50cc5 100644
--- a/res/layout/conversation_item_view_normal_spacious.xml
+++ b/res/layout/conversation_item_view_normal_spacious.xml
@@ -152,7 +152,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="-1dp"
-                    android:src="@drawable/ic_btn_star_off"
+                    android:src="@drawable/ic_star_outline_20dp"
                     style="@style/ConversationListSpaciousStarStyle"/>
 
             </LinearLayout>
diff --git a/res/layout/conversation_item_view_wide.xml b/res/layout/conversation_item_view_wide.xml
index adc6f4c7a..31a465797 100644
--- a/res/layout/conversation_item_view_wide.xml
+++ b/res/layout/conversation_item_view_wide.xml
@@ -152,7 +152,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="2dp"
-                    android:src="@drawable/ic_btn_star_off"
+                    android:src="@drawable/ic_star_outline_20dp"
                     style="@style/ConversationListWideStarStyle"/>
 
             </LinearLayout>
diff --git a/res/layout/conversation_load_spinner.xml b/res/layout/conversation_load_spinner.xml
index c658fda61..5398efcb6 100644
--- a/res/layout/conversation_load_spinner.xml
+++ b/res/layout/conversation_load_spinner.xml
@@ -19,7 +19,7 @@
     android:id="@+id/background_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/conversation_view_border_color"
+    android:background="@color/conversation_view_background_color"
     android:visibility="visible">
     <ProgressBar
         android:id="@+id/loading_progress"
diff --git a/res/layout/conversation_view_header.xml b/res/layout/conversation_view_header.xml
index 762ab5a5a..c676ef7b1 100644
--- a/res/layout/conversation_view_header.xml
+++ b/res/layout/conversation_view_header.xml
@@ -20,29 +20,29 @@
     android:id="@+id/conversation_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"
-    android:orientation="vertical"
-    style="@style/ConversationHeaderSideMarginStyle" >
+    android:background="@color/conversation_view_background_color"
+    android:orientation="horizontal"
+    android:minHeight="88sp"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    style="@style/ConversationHeaderMarginStyle" >
 
-    <TextView
-        android:id="@+id/subject"
-        android:layout_width="wrap_content"
+    <com.android.mail.browse.SubjectAndFolderView
+        android:id="@+id/subject_and_folder_view"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/conversation_header_vertical_padding"
-        android:includeFontPadding="false"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
         android:textAlignment="viewStart"
         style="@style/ConversationSubjectStyle" />
 
-    <com.android.mail.browse.FolderSpanTextView
-        android:id="@+id/folders"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right|end"
+    <com.android.mail.browse.StarView
+        android:id="@+id/conversation_header_star"
+        android:layout_width="52dp"
+        android:layout_height="52dp"
+        android:layout_gravity="center_vertical"
         android:background="?android:attr/selectableItemBackground"
-        android:gravity="right|end"
-        android:includeFontPadding="false"
-        android:lineSpacingExtra="4dp"
-        android:textSize="@dimen/conversation_folder_font_size"
-        style="@style/ConversationHeaderFolderStyle"/>
+        android:scaleType="center"
+        android:src="@drawable/star" />
 
 </com.android.mail.browse.ConversationViewHeader>
diff --git a/res/layout/fake_bottom_border.xml b/res/layout/fake_bottom_border.xml
index 023766800..1d4c717eb 100644
--- a/res/layout/fake_bottom_border.xml
+++ b/res/layout/fake_bottom_border.xml
@@ -1,6 +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.
+-->
 <View xmlns:android="http://schemas.android.com/apk/res/android"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@color/conversation_view_border_color"/>
\ No newline at end of file
+      android:background="@color/conversation_view_background_color" />
diff --git a/res/layout/secure_conversation_view.xml b/res/layout/secure_conversation_view.xml
index d60b4da89..827c044cd 100644
--- a/res/layout/secure_conversation_view.xml
+++ b/res/layout/secure_conversation_view.xml
@@ -18,7 +18,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/conversation_view_border_color" >
+    android:background="@color/conversation_view_background_color" >
 
     <com.android.mail.browse.MessageScrollView android:id="@+id/scroll_view"
         android:layout_width="match_parent"
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 9bf97fa03..dd0432f70 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -43,13 +43,10 @@
         <item name="android:paddingStart">@dimen/message_header_inner_side_padding</item>
     </style>
 
-    <style name="ConversationSubjectStyle" parent="AbstractConversationSubjectStyle">
-        <item name="android:paddingStart">@dimen/conversation_header_side_padding</item>
-        <item name="android:paddingEnd">@dimen/conversation_header_side_padding</item>
-    </style>
-
-    <style name="ConversationHeaderFolderStyle">
-        <item name="android:paddingStart">@dimen/conversation_header_side_padding</item>
+    <style name="ConversationHeaderMarginStyle">
+        <item name="android:layout_marginStart">@dimen/conversation_header_margin_side</item>
+        <item name="android:layout_marginEnd">@dimen/conversation_header_margin_side</item>
+        <item name="android:paddingStart">@dimen/conversation_header_padding_side</item>
     </style>
 
     <style name="CheckedTextStyle">
@@ -122,11 +119,6 @@
         <item name="android:layout_marginStart">@dimen/attachment_icon_padding</item>
     </style>
 
-    <style name="ConversationHeaderSideMarginStyle">
-        <item name="android:layout_marginStart">@dimen/conversation_header_margin_side</item>
-        <item name="android:layout_marginEnd">@dimen/conversation_header_margin_side</item>
-    </style>
-
     <style name="UndoNotificationStyle">
         <item name="android:layout_marginStart">@android:dimen/notification_large_icon_width</item>
     </style>
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 45c826017..aacdee286 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -19,9 +19,7 @@
     <dimen name="conversation_view_margin_side">16dp</dimen>
     <dimen name="conversation_header_margin_side">15dp</dimen>
     <dimen name="conversation_header_font_size">24sp</dimen>
-    <dimen name="conversation_header_vertical_padding">26dip</dimen>
-    <dimen name="conversation_header_vertical_padding_condensed">26dip</dimen>
-    <dimen name="conversation_header_side_padding">24dip</dimen>
+    <dimen name="conversation_header_padding_side">24dp</dimen>
     <dimen name="conversation_message_content_margin_side">24dp</dimen>
     <dimen name="conversation_page_gutter">0dip</dimen>
     <dimen name="message_header_inner_side_padding">16dp</dimen>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index cf11a37e5..33acffe61 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -37,4 +37,7 @@
     <declare-styleable name="FancySummaryListPreference">
         <attr name="entrySummaries" format="reference" />
     </declare-styleable>
+    <declare-styleable name="ConversationHeaderDrawableState">
+        <attr name="state_starred" format="boolean" />
+    </declare-styleable>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9ec58060c..1c9b107bf 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -62,9 +62,10 @@
     <color name="conv_header_add_label_background">#eeeeee</color>
 
     <!-- Conversation message header colors -->
-    <color name="conversation_view_border_color">#eeeeee</color>
+    <color name="conversation_view_border_color">#cbcbcb</color>
+    <color name="conversation_view_background_color">#f5f5f5</color>
     <color name="conv_header_text_light">#a6a8ab</color>
-    <color name="conv_header_text_dark">@color/dark_gray_text_color</color>
+    <color name="conv_header_text_dark">#212121</color>
     <color name="conv_header_text_link_blue">#35b4e3</color>
 
     <!-- Folder colors -->
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 6cecb7922..640a257ef 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -38,16 +38,14 @@
     <dimen name="conversation_message_content_margin_side">10dp</dimen>
     <dimen name="conversation_view_margin_side">8dp</dimen>
     <dimen name="conversation_header_margin_side">0dp</dimen>
-    <dimen name="conversation_header_font_size">18sp</dimen>
-    <dimen name="conversation_header_font_size_condensed">14sp</dimen>
-    <dimen name="conversation_header_vertical_padding">16dip</dimen>
-    <dimen name="conversation_header_vertical_padding_condensed">12dip</dimen>
-    <dimen name="conversation_header_side_padding">18dip</dimen>
+    <dimen name="conversation_header_font_size">20sp</dimen>
+    <dimen name="conversation_header_padding_side">16dp</dimen>
     <dimen name="conversation_folder_font_size">12sp</dimen>
-    <dimen name="conversation_folder_padding">1dip</dimen>
-    <dimen name="conversation_folder_padding_extra_width">14dip</dimen>
-    <dimen name="conversation_folder_padding_before">8dip</dimen>
-    <dimen name="conversation_folder_padding_above">4dip</dimen>
+    <dimen name="conversation_folder_padding">1dp</dimen>
+    <dimen name="conversation_folder_padding_extra_width">8dp</dimen>
+    <dimen name="conversation_folder_padding_after">8dp</dimen>
+    <dimen name="conversation_folder_rounded_corner_radius">1dp</dimen>
+    <dimen name="conversation_folder_margin_top">6dp</dimen>
     <dimen name="message_details_header_padding_start">16dip</dimen>
     <dimen name="message_details_header_padding_start_collapsed">68dip</dimen>
     <dimen name="message_details_header_padding_end">10dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 698d955a0..5373bec5a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -207,16 +207,16 @@
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="AbstractConversationSubjectStyle">
+    <style name="ConversationSubjectStyle">
         <item name="android:textColor">@color/conv_header_text_dark</item>
         <item name="android:textIsSelectable">true</item>
         <item name="android:textSize">@dimen/conversation_header_font_size</item>
-        <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="ConversationSubjectStyle" parent="AbstractConversationSubjectStyle">
-        <item name="android:paddingLeft">@dimen/conversation_header_side_padding</item>
-        <item name="android:paddingRight">@dimen/conversation_header_side_padding</item>
+    <style name="ConversationHeaderMarginStyle">
+        <item name="android:layout_marginLeft">@dimen/conversation_header_margin_side</item>
+        <item name="android:layout_marginRight">@dimen/conversation_header_margin_side</item>
+        <item name="android:paddingLeft">@dimen/conversation_header_padding_side</item>
     </style>
 
     <!-- Conversation view message header styles -->
@@ -562,10 +562,6 @@
         <item name="android:paddingLeft">@dimen/message_header_inner_side_padding</item>
     </style>
 
-    <style name="ConversationHeaderFolderStyle">
-        <item name="android:paddingLeft">@dimen/conversation_header_side_padding</item>
-    </style>
-
     <style name="CheckedTextStyle">
         <item name="android:paddingLeft">@dimen/checked_text_padding</item>
         <item name="android:paddingRight">@dimen/checked_text_padding</item>
@@ -637,11 +633,6 @@
         <item name="android:layout_marginLeft">@dimen/attachment_icon_padding</item>
     </style>
 
-    <style name="ConversationHeaderSideMarginStyle">
-        <item name="android:layout_marginLeft">@dimen/conversation_header_margin_side</item>
-        <item name="android:layout_marginRight">@dimen/conversation_header_margin_side</item>
-    </style>
-
     <style name="UndoNotificationStyle">
         <item name="android:layout_marginLeft">@android:dimen/notification_large_icon_width</item>
     </style>