New caret for tablet.

Not to be confused with a carrot, carat, or karat.

Change-Id: I3748d295a8599ffcb528bdfc1d376d3fc3b64396

13 files changed, 11 insertions, 7 deletions

diff --git a/res/drawable-hdpi/caret_grey.9.png b/res/drawable-hdpi/caret_grey.9.png
new file mode 100644
index 000000000..e59a5df2f
--- /dev/null
+++ b/res/drawable-hdpi/caret_grey.9.png
diff --git a/res/drawable-hdpi/ic_carrot_holo.9.png b/res/drawable-hdpi/ic_carrot_holo.9.png
deleted file mode 100644
index d7d65022c..000000000
--- a/res/drawable-hdpi/ic_carrot_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/caret_grey.9.png b/res/drawable-mdpi/caret_grey.9.png
new file mode 100644
index 000000000..cd62abf65
--- /dev/null
+++ b/res/drawable-mdpi/caret_grey.9.png
diff --git a/res/drawable-mdpi/ic_carrot_holo.9.png b/res/drawable-mdpi/ic_carrot_holo.9.png
deleted file mode 100644
index 372fe9ff3..000000000
--- a/res/drawable-mdpi/ic_carrot_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/caret_grey.9.png b/res/drawable-xhdpi/caret_grey.9.png
new file mode 100644
index 000000000..4c09f168f
--- /dev/null
+++ b/res/drawable-xhdpi/caret_grey.9.png
diff --git a/res/drawable-xhdpi/ic_carrot_holo.9.png b/res/drawable-xhdpi/ic_carrot_holo.9.png
deleted file mode 100644
index 2c5f03a61..000000000
--- a/res/drawable-xhdpi/ic_carrot_holo.9.png
+++ /dev/null
diff --git a/res/layout/conversation_view_header.xml b/res/layout/conversation_view_header.xml
index fd151c08f..673a8a576 100644
--- a/res/layout/conversation_view_header.xml
+++ b/res/layout/conversation_view_header.xml
@@ -20,6 +20,10 @@
     android:id="@+id/conversation_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/conversation_header_margin_side"
+    android:layout_marginLeft="@dimen/conversation_header_margin_side"
+    android:layout_marginEnd="@dimen/conversation_header_margin_side"
+    android:layout_marginRight="@dimen/conversation_header_margin_side"
     android:background="@android:color/white"
     android:orientation="vertical" >
 
diff --git a/res/raw/template_conversation_lower.html b/res/raw/template_conversation_lower.html
index b1280771d..9c18cf543 100644
--- a/res/raw/template_conversation_lower.html
+++ b/res/raw/template_conversation_lower.html
@@ -5,7 +5,6 @@
   var MSG_SHOW_ELIDED = '%s';
   var DOC_BASE_URI = '%s';
   var CONVERSATION_BASE_URI = '%s';
-  var VIEW_WIDTH = %s;
   var WIDE_VIEWPORT_WIDTH = %s;
   var ENABLE_CONTENT_READY = %s;
   var NORMALIZE_MESSAGE_WIDTHS = %s;
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index ba74f9e3f..517021bd6 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -18,10 +18,11 @@
 <resources>
     <dimen name="conversation_view_margin_side">16dp</dimen>
     <dimen name="conversation_view_margin_side_minus_gradient">15dp</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">40dip</dimen>
+    <dimen name="conversation_header_side_padding">24dip</dimen>
     <dimen name="conversation_page_gutter">0dip</dimen>
     <dimen name="message_border_height">16dp</dimen>
     <dimen name="message_header_padding_start">24dp</dimen>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 28fe4f474..2da5f0a8e 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -37,6 +37,7 @@
     <dimen name="conversation_message_content_margin_side">16dp</dimen>
     <dimen name="conversation_view_margin_side">8dp</dimen>
     <dimen name="conversation_view_margin_side_minus_gradient">7dp</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>
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index b6e8af447..240d506fe 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -440,8 +440,7 @@ public class ConversationItemView extends View
                     BitmapFactory.decodeResource(res, R.drawable.ic_badge_reply_forward_holo_light);
             STATE_CALENDAR_INVITE =
                     BitmapFactory.decodeResource(res, R.drawable.ic_badge_invite_holo_light);
-            VISIBLE_CONVERSATION_CARET = BitmapFactory.decodeResource(res,
-                    R.drawable.ic_carrot_holo);
+            VISIBLE_CONVERSATION_CARET = BitmapFactory.decodeResource(res, R.drawable.caret_grey);
             RIGHT_EDGE_TABLET = res.getDrawable(R.drawable.list_edge_tablet);
             PLACEHOLDER = res.getDrawable(drawable.ic_attachment_load);
             PROGRESS_BAR = res.getDrawable(drawable.progress_holo);
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index eb4799c21..211758014 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -732,7 +732,7 @@ public class ConversationViewFragment extends AbstractConversationViewFragment i
                 false /* firstBorder */, true /* lastBorder */);
 
         // If the conversation has specified a base uri, use it here, otherwise use mBaseUri
-        return mTemplates.endConversation(mBaseUri, mConversation.getBaseUri(mBaseUri), 320,
+        return mTemplates.endConversation(mBaseUri, mConversation.getBaseUri(mBaseUri),
                 mWebView.getViewportWidth(), enableContentReadySignal, isOverviewMode(mAccount),
                 applyTransforms, applyTransforms);
     }
diff --git a/src/com/android/mail/ui/HtmlConversationTemplates.java b/src/com/android/mail/ui/HtmlConversationTemplates.java
index d70362c08..a285247d8 100644
--- a/src/com/android/mail/ui/HtmlConversationTemplates.java
+++ b/src/com/android/mail/ui/HtmlConversationTemplates.java
@@ -185,7 +185,7 @@ public class HtmlConversationTemplates {
         mInProgress = true;
     }
 
-    public String endConversation(String docBaseUri, String conversationBaseUri, int viewWidth,
+    public String endConversation(String docBaseUri, String conversationBaseUri,
             int viewportWidth, boolean enableContentReadySignal, boolean normalizeMessageWidths,
             boolean enableMungeTables, boolean enableMungeImages) {
         if (!mInProgress) {
@@ -196,7 +196,7 @@ public class HtmlConversationTemplates {
 
         append(sConversationLower, contentReadyClass, mContext.getString(R.string.hide_elided),
                 mContext.getString(R.string.show_elided), docBaseUri, conversationBaseUri,
-                viewWidth, viewportWidth, enableContentReadySignal, normalizeMessageWidths,
+                viewportWidth, enableContentReadySignal, normalizeMessageWidths,
                 enableMungeTables, enableMungeImages);
 
         mInProgress = false;