ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use new holo light icons 

Use the new icons where appropriate. This is not a complete change as there are
still some icons missing.

Change-Id: I51d1458749343ddfc6456dc2a9853b8bc2540e26
This commit is contained in:
Todd Kennedy 2011-01-06 13:42:20 -08:00
parent 2f1a7e8d0a
commit 64ac7a6cc8
21 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_menu_compose_holo_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 937 B

BIN
res/drawable-hdpi/ic_menu_refresh_holo_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 937 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
res/drawable-hdpi/ic_menu_send_holo_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 905 B

After

Width:  |  Height:  |  Size: 951 B

BIN
res/drawable-mdpi/ic_menu_compose_holo_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 922 B

After

Width:  |  Height:  |  Size: 730 B

BIN
res/drawable-mdpi/ic_menu_refresh_holo_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 730 B

After

Width:  |  Height:  |  Size: 922 B

BIN
res/drawable-mdpi/ic_menu_send_holo_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 665 B

After

Width:  |  Height:  |  Size: 681 B

3
res/layout-xlarge/message_compose.xml
View File

@ -132,11 +132,12 @@
android:layout_width="wrap_content"
android:text="@string/add_cc_bcc_action"
/>
<Button
<ImageButton
android:id="@+id/add_attachment"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/add_attachment_action"
android:src="@drawable/ic_add_attachment_holo_light"
/>
<!--

8
res/layout-xlarge/message_view_fragment.xml
View File

@ -108,7 +108,7 @@
android:layout_height="match_parent"
android:layout_marginRight="16dip"
android:layout_marginLeft="16dip"
android:src="@drawable/reply"
android:src="@drawable/ic_reply"
android:visibility="gone"
style="@android:style/Widget.Holo.Button.Borderless"
/>
@ -118,7 +118,7 @@
android:layout_height="match_parent"
android:layout_marginRight="16dip"
android:layout_marginLeft="16dip"
android:src="@drawable/reply_all"
android:src="@drawable/ic_reply_all"
android:visibility="gone"
style="@android:style/Widget.Holo.Button.Borderless"
/>
@ -128,7 +128,7 @@
android:layout_height="match_parent"
android:layout_marginRight="16dip"
android:layout_marginLeft="16dip"
android:src="@drawable/forward"
android:src="@drawable/ic_forward"
android:visibility="gone"
style="@android:style/Widget.Holo.Button.Borderless"
/>
@ -138,7 +138,7 @@
android:layout_height="match_parent"
android:layout_marginRight="16dip"
android:layout_marginLeft="16dip"
android:src="@drawable/btn_star_big_buttonless_off"
android:src="@drawable/ic_star_none_holo_light"
android:visibility="gone"
style="@android:style/Widget.Holo.Button.Borderless"
/>

4
res/layout/message_compose_attachment.xml
View File

@ -23,7 +23,7 @@
android:paddingBottom="6dip">
<ImageButton
android:id="@+id/attachment_delete"
android:src="@android:drawable/ic_delete"
android:src="@drawable/ic_remove_attachment_holo_light"
android:layout_alignParentRight="true"
android:layout_height="42dip"
android:layout_width="42dip" />
@ -45,7 +45,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_email_attachment"
android:src="@drawable/ic_attachment_holo_light"
android:layout_marginLeft="1dip"
android:layout_centerVertical="true" />
</RelativeLayout>

2
res/layout/message_view_attachment.xml
View File

@ -125,6 +125,6 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_alignParentLeft="true"
android:src="@drawable/ic_email_attachment" />
android:src="@drawable/ic_attachment_holo_light" />
</LinearLayout>
</FrameLayout>

2
res/layout/widget_list_item.xml
View File

@ -44,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="-10sp"
android:layout_marginRight="-4dip"
android:src="@drawable/ic_attachment_holo_light" />
android:src="@drawable/ic_badge_attachment" />
<TextView
android:id="@+id/widget_date"
android:layout_width="wrap_content"

4
res/menu/message_compose_option.xml
View File

@ -19,7 +19,8 @@
<item
android:id="@+id/send"
android:title="@string/send_action"
android:showAsAction="always"
android:showAsAction="always|withText"
android:icon="@drawable/ic_menu_send_holo_light"
android:alphabeticShortcut="s"
/>
<item
@ -33,6 +34,7 @@
android:id="@+id/discard"
android:title="@string/discard_action"
android:showAsAction="always"
android:icon="@drawable/ic_menu_trash_holo_light"
android:alphabeticShortcut="q"
/>
</menu>

3
res/menu/message_list_fragment_option.xml
View File

@ -20,6 +20,7 @@
android:id="@+id/send"
android:orderInCategory="50"
android:title="@string/message_list_send_pending_messages_action"
android:showAsAction="ifRoom"
android:showAsAction="ifRoom|withText"
android:icon="@drawable/ic_menu_send_holo_light"
/>
</menu>

6
res/menu/message_list_selection_mode.xml
View File

@ -16,15 +16,21 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/move" android:title="@string/move_action"
android:icon="@drawable/ic_menu_move_to_holo_light"
android:showAsAction="always" />
<item android:id="@+id/mark_read" android:title="@string/read_action"
android:icon="@drawable/ic_menu_mark"
android:showAsAction="always" />
<item android:id="@+id/mark_unread" android:title="@string/unread_action"
android:icon="@drawable/ic_menu_mark"
android:showAsAction="always" />
<item android:id="@+id/add_star" android:title="@string/set_star_action"
android:icon="@drawable/ic_menu_add_star_holo_light"
android:showAsAction="always" />
<item android:id="@+id/remove_star" android:title="@string/remove_star_action"
android:icon="@drawable/ic_menu_add_star_holo_light"
android:showAsAction="always" />
<item android:id="@+id/delete" android:title="@string/delete_action"
android:icon="@drawable/ic_menu_trash_holo_light"
android:showAsAction="always" />
</menu>

4
res/menu/message_list_xl_option.xml
View File

@ -20,7 +20,7 @@
android:orderInCategory="100"
android:alphabeticShortcut="c"
android:title="@string/compose_action"
android:icon="@drawable/ic_menu_compose"
android:icon="@drawable/ic_menu_compose_holo_light"
android:showAsAction="ifRoom"
/>
<item
@ -28,7 +28,7 @@
android:orderInCategory="200"
android:alphabeticShortcut="r"
android:title="@string/refresh_action"
android:icon="@drawable/ic_menu_refresh"
android:icon="@drawable/ic_menu_refresh_holo_light"
android:showAsAction="ifRoom"
/>
<item

3
res/menu/message_view_fragment_option.xml
View File

@ -20,12 +20,14 @@
android:id="@+id/move"
android:orderInCategory="1000"
android:title="@string/move_action"
android:icon="@drawable/ic_menu_move_to_holo_light"
android:showAsAction="ifRoom"
/>
<item
android:id="@+id/delete"
android:orderInCategory="1100"
android:title="@string/delete_action"
android:icon="@drawable/ic_menu_trash_holo_light"
android:showAsAction="ifRoom"
/>
<item
@ -33,5 +35,6 @@
android:orderInCategory="1200"
android:title="@string/mark_as_unread_action"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_menu_mark"
/>
</menu>

10
res/values/arrays.xml
View File

@ -161,19 +161,19 @@
of the types of mailboxes defined in EmailContent -->
<array name="mailbox_display_icons" translatable="false">
<!-- TYPE_INBOX = 0 -->
<item>@drawable/ic_list_inbox</item>
<item>@drawable/ic_folder_inbox_holo_light</item>
<!-- TYPE_MAIL = 1 -->
<item></item>
<!-- TYPE_PARENT = 2 -->
<item></item>
<!-- TYPE_DRAFTS = 3 -->
<item>@drawable/ic_list_drafts</item>
<item>@drawable/ic_folder_drafts_holo_light</item>
<!-- TYPE_OUTBOX = 4 -->
<item>@drawable/ic_list_outbox</item>
<item>@drawable/ic_folder_outbox_holo_light</item>
<!-- TYPE_SENT = 5 -->
<item>@drawable/ic_list_sent</item>
<item>@drawable/ic_folder_sent_holo_light</item>
<!-- TYPE_TRASH = 6 -->
<item>@drawable/ic_list_trash</item>
<item>@drawable/ic_folder_trash_holo_light</item>
<!-- TYPE_JUNK = 7 -->
<item>@drawable/ic_list_spam</item>
</array>

2
src/com/android/email/Utility.java
View File

@ -383,7 +383,7 @@ public class Utility {
mSpecialMailboxDrawable =
context.getResources().obtainTypedArray(R.array.mailbox_display_icons);
mSummaryStarredMailboxDrawable =
context.getResources().getDrawable(R.drawable.ic_list_starred);
context.getResources().getDrawable(R.drawable.ic_folder_star_holo_light);
mSummaryCombinedInboxDrawable =
context.getResources().getDrawable(R.drawable.ic_list_combined_inbox);
}

6
src/com/android/email/activity/MessageListItem.java
View File

@ -202,10 +202,10 @@ public class MessageListItem extends View {
sBoldPaint.setTypeface(Typeface.DEFAULT_BOLD);
sBoldPaint.setTextSize(sTextSize);
sBoldPaint.setAntiAlias(true);
sAttachmentIcon = BitmapFactory.decodeResource(r, R.drawable.ic_mms_attachment_small);
sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_calendar_event_small);
sAttachmentIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_attachment);
sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_badge_invite);
sFavoriteIconOff =
BitmapFactory.decodeResource(r, R.drawable.btn_star_big_buttonless_dark_off);
BitmapFactory.decodeResource(r, R.drawable.ic_star_none_holo_light);
sFavoriteIconOn =
BitmapFactory.decodeResource(r, R.drawable.btn_star_big_buttonless_dark_on);
sSelectedIconOff =

2
src/com/android/email/activity/MessageViewFragment.java
View File

@ -150,7 +150,7 @@ public class MessageViewFragment extends MessageViewFragmentBase {
final Resources res = getActivity().getResources();
mFavoriteIconOn = res.getDrawable(R.drawable.btn_star_big_buttonless_on);
mFavoriteIconOff = res.getDrawable(R.drawable.btn_star_big_buttonless_off);
mFavoriteIconOff = res.getDrawable(R.drawable.ic_star_none_holo_light);
}
@Override

2
tests/src/com/android/email/provider/AttachmentProviderTests.java
View File

@ -665,7 +665,7 @@ public class AttachmentProviderTests extends ProviderTestCase2<AttachmentProvide
private String createAttachmentFile(Account forAccount, long id) throws IOException {
File outFile = getAttachmentFile(forAccount, id);
Bitmap bitmap = BitmapFactory.decodeResource(getContext().getResources(),
R.drawable.ic_email_attachment);
R.drawable.ic_attachment_holo_light);
FileOutputStream out = new FileOutputStream(outFile);
bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
out.close();