Misc visual fixes to Email

- dropped in bigger assets for mailbox triangle
- dropped in bigger assets for checkbox for xhdpi
- dropped in proper star asset for message list
- fixed some padding issues for message list item
- remove the color label from "Combined view" in the account drop down

Bug: 5248125
Change-Id: Ic15d98013f2afb42bf55c327654009ef8baa1b78

res/layout/message_list_item_normal.xml

@@ -35,7 +35,6 @@
             android:id="@+id/checkmark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dip"
             android:layout_centerVertical="true"
             android:layout_centerHorizontal="true"
             android:src="@drawable/btn_check_on_normal_holo_light"
@@ -44,6 +43,7 @@
             android:id="@+id/reply_state"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/message_list_icon_padding_compensation"
             android:layout_centerHorizontal="true"
             android:layout_above="@+id/checkmark"
             android:src="@drawable/ic_badge_reply_holo_light"
@@ -72,7 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:src="@drawable/btn_star_off_normal_holo_light" />
+            android:src="@drawable/btn_star_off_normal_email_holo_light" />
 
         <LinearLayout
             android:id="@+id/date_container"
@@ -80,6 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_above="@+id/star"
+            android:layout_marginBottom="@dimen/message_list_icon_padding_compensation"
             android:orientation="horizontal"
             >
             <!-- reserve enough vertical space for two icons -->

res/layout/message_list_item_wide.xml

@@ -98,5 +98,5 @@
         android:layout_marginLeft="16dip"
         android:layout_marginRight="16dip"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/btn_star_off_normal_holo_light" />
+        android:src="@drawable/btn_star_off_normal_email_holo_light" />
 </LinearLayout>

res/values-sw600dp/dimensions.xml

@@ -23,6 +23,10 @@
     <dimen name="message_header_badge_width">64dip</dimen>
     <dimen name="message_header_name_margin">16dip</dimen>
 
+    <!-- hack around the fact that the checkbox below the reply state has a lot
+         of padding built into the asset -->
+    <dimen name="message_list_icon_padding_compensation">-6dip</dimen>
+
     <!-- Account Setup Activities -->
     <!-- inset distance for setup/settings buttons -->
     <dimen name="setup_buttons_padding_left">16dip</dimen>

res/values/dimensions.xml

@@ -22,6 +22,8 @@
     <dimen name="message_list_item_height_normal">70dip</dimen>
     <dimen name="message_list_item_color_tip_width">35dip</dimen>
     <dimen name="message_list_item_color_tip_height">6dip</dimen>
+    <dimen name="message_list_badge_margin">4dip</dimen>
+    <dimen name="message_list_icon_padding_compensation">3dip</dimen>
 
     <dimen name="message_header_height">48dip</dimen>
     <dimen name="message_header_badge_width">48dip</dimen>

src/com/android/email/activity/AccountSelectorAdapter.java

@@ -170,7 +170,12 @@ public class AccountSelectorAdapter extends CursorAdapter {
                 unreadCountView.setText(UiUtilities.getMessageCountForUi(mContext,
                         getAccountUnreadCount(c), true));
 
-                if (((CursorWithExtras) c).getAccountId() == Account.ACCOUNT_ID_COMBINED_VIEW) {
+                // If we're on a combined account, show the color chip indicators for all real
+                // accounts so it can be used as a legend.
+                boolean isCombinedActive =
+                        ((CursorWithExtras) c).getAccountId() == Account.ACCOUNT_ID_COMBINED_VIEW;
+
+                if (isCombinedActive && Account.isNormalAccount(id)) {
                     chipView.setBackgroundColor(mResourceHelper.getAccountColor(id));
                     chipView.setVisibility(View.VISIBLE);
                 } else {

src/com/android/email/activity/MessageListItem.java

@@ -93,6 +93,7 @@ public class MessageListItem extends View {
     private static final TextPaint sHighlightPaint = new TextPaint();
     private static Bitmap sAttachmentIcon;
     private static Bitmap sInviteIcon;
+    private static int sBadgeMargin;
     private static Bitmap sFavoriteIconOff;
     private static Bitmap sFavoriteIconOn;
     private static Bitmap sSelectedIconOn;
@@ -157,10 +158,11 @@ public class MessageListItem extends View {
             sHighlightPaint.setColor(TextUtilities.HIGHLIGHT_COLOR_INT);
             sAttachmentIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_attachment);
             sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_invite_holo_light);
+            sBadgeMargin = r.getDimensionPixelSize(R.dimen.message_list_badge_margin);
             sFavoriteIconOff =
-                BitmapFactory.decodeResource(r, R.drawable.btn_star_off_normal_holo_light);
+                BitmapFactory.decodeResource(r, R.drawable.btn_star_off_normal_email_holo_light);
             sFavoriteIconOn =
-                BitmapFactory.decodeResource(r, R.drawable.btn_star_on_normal_holo_light);
+                BitmapFactory.decodeResource(r, R.drawable.btn_star_on_normal_email_holo_light);
             sSelectedIconOff =
                 BitmapFactory.decodeResource(r, R.drawable.btn_check_off_normal_holo_light);
             sSelectedIconOn =
@@ -423,7 +425,7 @@ public class MessageListItem extends View {
         // TODO: deal with the icon layouts better from the coordinate class so that this logic
         // doesn't have to exist.
         // Draw the attachment and invite icons, if necessary.
-        int iconsLeft = dateX;
+        int iconsLeft = dateX - sBadgeMargin;
         if (mHasAttachment) {
             iconsLeft = iconsLeft - sAttachmentIcon.getWidth();
             canvas.drawBitmap(sAttachmentIcon, iconsLeft, mCoordinates.paperclipY, null);