Update icons with latest drop from UI
Change-Id: Ic23f1bee28c8aef1974225f9c03edc92c845f8c7
Before Width: | Height: | Size: 202 B After Width: | Height: | Size: 202 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 979 B |
Before Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 2.4 KiB |
After Width: | Height: | Size: 3.8 KiB |
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 117 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 875 B After Width: | Height: | Size: 908 B |
After Width: | Height: | Size: 885 B |
After Width: | Height: | Size: 719 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 786 B |
Before Width: | Height: | Size: 905 B After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 1.0 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 193 B After Width: | Height: | Size: 192 B |
Before Width: | Height: | Size: 884 B |
Before Width: | Height: | Size: 689 B |
Before Width: | Height: | Size: 873 B |
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1011 B After Width: | Height: | Size: 877 B |
Before Width: | Height: | Size: 659 B After Width: | Height: | Size: 654 B |
After Width: | Height: | Size: 657 B |
After Width: | Height: | Size: 620 B |
Before Width: | Height: | Size: 1022 B After Width: | Height: | Size: 604 B |
Before Width: | Height: | Size: 665 B After Width: | Height: | Size: 792 B |
After Width: | Height: | Size: 811 B |
After Width: | Height: | Size: 884 B |
After Width: | Height: | Size: 962 B |
|
@ -180,7 +180,7 @@
|
||||||
android:paddingLeft="0dip"
|
android:paddingLeft="0dip"
|
||||||
android:paddingRight="0dip"
|
android:paddingRight="0dip"
|
||||||
android:gravity="left|center_vertical"
|
android:gravity="left|center_vertical"
|
||||||
android:src="@drawable/ic_add_attachment_holo_light"
|
android:src="@drawable/ic_attachment_holo_light"
|
||||||
/>
|
/>
|
||||||
</RelativeLayout> <!-- end of buttons -->
|
</RelativeLayout> <!-- end of buttons -->
|
||||||
</LinearLayout> <!-- end of headers+buttons -->
|
</LinearLayout> <!-- end of headers+buttons -->
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
/>
|
/>
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/favorite"
|
android:id="@+id/favorite"
|
||||||
android:src="@drawable/ic_star_none_holo_light"
|
android:src="@drawable/btn_star_off_normal_email_holo_light"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
style="@style/message_view_action_buttons"
|
style="@style/message_view_action_buttons"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -146,7 +146,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:src="@drawable/btn_star_big_buttonless_off" />
|
android:src="@drawable/btn_star_off_normal_email_holo_light" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<!-- end of header area -->
|
<!-- end of header area -->
|
||||||
|
|
|
@ -50,16 +50,14 @@
|
||||||
android:id="@+id/widget_invite"
|
android:id="@+id/widget_invite"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="-10sp"
|
android:layout_marginTop="-4sp"
|
||||||
android:layout_marginRight="-4dip"
|
android:src="@drawable/ic_badge_invite_widget" />
|
||||||
android:src="@drawable/ic_badge_invite" />
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/widget_attachment"
|
android:id="@+id/widget_attachment"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="-10sp"
|
android:layout_marginTop="-4sp"
|
||||||
android:layout_marginRight="-4dip"
|
android:src="@drawable/ic_badge_attachment_widget" />
|
||||||
android:src="@drawable/ic_badge_attachment" />
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/widget_date"
|
android:id="@+id/widget_date"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|
|
@ -22,13 +22,13 @@
|
||||||
android:icon="@drawable/ic_menu_mark_read_holo_light"
|
android:icon="@drawable/ic_menu_mark_read_holo_light"
|
||||||
android:showAsAction="always" />
|
android:showAsAction="always" />
|
||||||
<item android:id="@+id/mark_unread" android:title="@string/unread_action"
|
<item android:id="@+id/mark_unread" android:title="@string/unread_action"
|
||||||
android:icon="@drawable/ic_menu_mark"
|
android:icon="@drawable/ic_menu_mark_unread_holo_light"
|
||||||
android:showAsAction="always" />
|
android:showAsAction="always" />
|
||||||
<item android:id="@+id/add_star" android:title="@string/set_star_action"
|
<item android:id="@+id/add_star" android:title="@string/set_star_action"
|
||||||
android:icon="@drawable/ic_menu_add_star_holo_light"
|
android:icon="@drawable/ic_menu_star_holo_light"
|
||||||
android:showAsAction="always" />
|
android:showAsAction="always" />
|
||||||
<item android:id="@+id/remove_star" android:title="@string/remove_star_action"
|
<item android:id="@+id/remove_star" android:title="@string/remove_star_action"
|
||||||
android:icon="@drawable/ic_menu_add_star_holo_light"
|
android:icon="@drawable/ic_menu_star_off_holo_light"
|
||||||
android:showAsAction="always" />
|
android:showAsAction="always" />
|
||||||
<item android:id="@+id/delete" android:title="@string/delete_action"
|
<item android:id="@+id/delete" android:title="@string/delete_action"
|
||||||
android:icon="@drawable/ic_menu_trash_holo_light"
|
android:icon="@drawable/ic_menu_trash_holo_light"
|
||||||
|
|
|
@ -34,6 +34,6 @@
|
||||||
android:orderInCategory="1200"
|
android:orderInCategory="1200"
|
||||||
android:title="@string/mark_as_unread_action"
|
android:title="@string/mark_as_unread_action"
|
||||||
android:showAsAction="ifRoom"
|
android:showAsAction="ifRoom"
|
||||||
android:icon="@drawable/ic_menu_mark_read_holo_light"
|
android:icon="@drawable/ic_menu_mark_unread_holo_light"
|
||||||
/>
|
/>
|
||||||
</menu>
|
</menu>
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
You may obtain a copy of the License at
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
Unless required by applicable law or agreed to in writing, software
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
@ -43,6 +43,6 @@
|
||||||
android:id="@+id/mark_as_unread"
|
android:id="@+id/mark_as_unread"
|
||||||
android:alphabeticShortcut="u"
|
android:alphabeticShortcut="u"
|
||||||
android:title="@string/mark_as_unread_action"
|
android:title="@string/mark_as_unread_action"
|
||||||
android:icon="@drawable/ic_menu_mark"
|
android:icon="@drawable/ic_menu_mark_unread_holo_light"
|
||||||
/>
|
/>
|
||||||
</menu>
|
</menu>
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
<dimen name="message_list_item_checkbox_hit_width">64dip</dimen>
|
<dimen name="message_list_item_checkbox_hit_width">64dip</dimen>
|
||||||
<dimen name="message_list_item_favorite_hit_width">64dip</dimen>
|
<dimen name="message_list_item_favorite_hit_width">64dip</dimen>
|
||||||
<dimen name="message_list_item_favorite_padding_right">16dip</dimen>
|
<dimen name="message_list_item_favorite_padding_right">16dip</dimen>
|
||||||
|
<dimen name="message_list_item_badge_padding_top">8dip</dimen>
|
||||||
|
<dimen name="message_list_item_badge_padding_right">-8dip</dimen>
|
||||||
<dimen name="message_list_item_date_icon_width_wide">144dip</dimen>
|
<dimen name="message_list_item_date_icon_width_wide">144dip</dimen>
|
||||||
<dimen name="message_list_item_date_icon_width_narrow">112dip</dimen>
|
<dimen name="message_list_item_date_icon_width_narrow">112dip</dimen>
|
||||||
<dimen name="message_list_item_sender_padding_top_narrow">10dip</dimen>
|
<dimen name="message_list_item_sender_padding_top_narrow">10dip</dimen>
|
||||||
|
|
|
@ -123,6 +123,8 @@ public class MessageListItem extends View {
|
||||||
private static int sDateIconWidthNarrow;
|
private static int sDateIconWidthNarrow;
|
||||||
private static int sFavoriteHitWidth;
|
private static int sFavoriteHitWidth;
|
||||||
private static int sFavoritePaddingRight;
|
private static int sFavoritePaddingRight;
|
||||||
|
private static int sBadgePaddingTop;
|
||||||
|
private static int sBadgePaddingRight;
|
||||||
private static int sSenderPaddingTopNarrow;
|
private static int sSenderPaddingTopNarrow;
|
||||||
private static int sSenderWidth;
|
private static int sSenderWidth;
|
||||||
private static int sPaddingLarge;
|
private static int sPaddingLarge;
|
||||||
|
@ -159,6 +161,10 @@ public class MessageListItem extends View {
|
||||||
r.getDimensionPixelSize(R.dimen.message_list_item_favorite_hit_width);
|
r.getDimensionPixelSize(R.dimen.message_list_item_favorite_hit_width);
|
||||||
sFavoritePaddingRight =
|
sFavoritePaddingRight =
|
||||||
r.getDimensionPixelSize(R.dimen.message_list_item_favorite_padding_right);
|
r.getDimensionPixelSize(R.dimen.message_list_item_favorite_padding_right);
|
||||||
|
sBadgePaddingTop =
|
||||||
|
r.getDimensionPixelSize(R.dimen.message_list_item_badge_padding_top);
|
||||||
|
sBadgePaddingRight =
|
||||||
|
r.getDimensionPixelSize(R.dimen.message_list_item_badge_padding_right);
|
||||||
sSenderPaddingTopNarrow =
|
sSenderPaddingTopNarrow =
|
||||||
r.getDimensionPixelSize(R.dimen.message_list_item_sender_padding_top_narrow);
|
r.getDimensionPixelSize(R.dimen.message_list_item_sender_padding_top_narrow);
|
||||||
sDateIconWidthWide =
|
sDateIconWidthWide =
|
||||||
|
@ -205,9 +211,9 @@ public class MessageListItem extends View {
|
||||||
sAttachmentIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_attachment);
|
sAttachmentIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_attachment);
|
||||||
sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_invite);
|
sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_invite);
|
||||||
sFavoriteIconOff =
|
sFavoriteIconOff =
|
||||||
BitmapFactory.decodeResource(r, R.drawable.ic_star_none_holo_light);
|
BitmapFactory.decodeResource(r, R.drawable.btn_star_off_normal_email_holo_light);
|
||||||
sFavoriteIconOn =
|
sFavoriteIconOn =
|
||||||
BitmapFactory.decodeResource(r, R.drawable.btn_star_big_buttonless_dark_on);
|
BitmapFactory.decodeResource(r, R.drawable.btn_star_on_normal_email_holo_light);
|
||||||
sSelectedIconOff =
|
sSelectedIconOff =
|
||||||
BitmapFactory.decodeResource(r, R.drawable.btn_check_off_normal_holo_light);
|
BitmapFactory.decodeResource(r, R.drawable.btn_check_off_normal_holo_light);
|
||||||
sSelectedIconOn =
|
sSelectedIconOn =
|
||||||
|
@ -474,20 +480,24 @@ public class MessageListItem extends View {
|
||||||
|
|
||||||
int iconTop;
|
int iconTop;
|
||||||
if (mHasAttachment) {
|
if (mHasAttachment) {
|
||||||
left -= sAttachmentIcon.getWidth() + sPaddingSmall;
|
left -= sAttachmentIcon.getWidth();
|
||||||
if (mMode == MODE_WIDE) {
|
if (mMode == MODE_WIDE) {
|
||||||
iconTop = (mViewHeight - sAttachmentIcon.getHeight()) / 2;
|
iconTop = (mViewHeight - sAttachmentIcon.getHeight()) / 2;
|
||||||
|
left -= sPaddingSmall;
|
||||||
} else {
|
} else {
|
||||||
iconTop = senderY - sAttachmentIcon.getHeight();
|
iconTop = senderY - sAttachmentIcon.getHeight() + sBadgePaddingTop;
|
||||||
|
left -= sBadgePaddingRight;
|
||||||
}
|
}
|
||||||
canvas.drawBitmap(sAttachmentIcon, left, iconTop, sDefaultPaint);
|
canvas.drawBitmap(sAttachmentIcon, left, iconTop, sDefaultPaint);
|
||||||
}
|
}
|
||||||
if (mHasInvite) {
|
if (mHasInvite) {
|
||||||
left -= sInviteIcon.getWidth() + sPaddingSmall;
|
left -= sInviteIcon.getWidth();
|
||||||
if (mMode == MODE_WIDE) {
|
if (mMode == MODE_WIDE) {
|
||||||
iconTop = (mViewHeight - sInviteIcon.getHeight()) / 2;
|
iconTop = (mViewHeight - sInviteIcon.getHeight()) / 2;
|
||||||
|
left -= sPaddingSmall;
|
||||||
} else {
|
} else {
|
||||||
iconTop = senderY - sInviteIcon.getHeight();
|
iconTop = senderY - sInviteIcon.getHeight() + sBadgePaddingTop;
|
||||||
|
left -= sBadgePaddingRight;
|
||||||
}
|
}
|
||||||
canvas.drawBitmap(sInviteIcon, left, iconTop, sDefaultPaint);
|
canvas.drawBitmap(sInviteIcon, left, iconTop, sDefaultPaint);
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,8 +140,8 @@ public class MessageViewFragment extends MessageViewFragmentBase
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
final Resources res = getActivity().getResources();
|
final Resources res = getActivity().getResources();
|
||||||
mFavoriteIconOn = res.getDrawable(R.drawable.btn_star_big_buttonless_on);
|
mFavoriteIconOn = res.getDrawable(R.drawable.btn_star_on_normal_email_holo_light);
|
||||||
mFavoriteIconOff = res.getDrawable(R.drawable.ic_star_none_holo_light);
|
mFavoriteIconOff = res.getDrawable(R.drawable.btn_star_off_normal_email_holo_light);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|