diff --git a/email2/res/drawable-hdpi/attachment_bg_holo.9.png b/email2/res/drawable-hdpi/attachment_bg_holo.9.png deleted file mode 100644 index 43983c5fe..000000000 Binary files a/email2/res/drawable-hdpi/attachment_bg_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/btn_check_off_normal_holo_light.png b/email2/res/drawable-hdpi/btn_check_off_normal_holo_light.png deleted file mode 100644 index 351a4f088..000000000 Binary files a/email2/res/drawable-hdpi/btn_check_off_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/btn_check_on_normal_holo_light.png b/email2/res/drawable-hdpi/btn_check_on_normal_holo_light.png deleted file mode 100644 index 4b4364c92..000000000 Binary files a/email2/res/drawable-hdpi/btn_check_on_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/btn_maybe_off.png b/email2/res/drawable-hdpi/btn_maybe_off.png deleted file mode 100644 index f907a9dc1..000000000 Binary files a/email2/res/drawable-hdpi/btn_maybe_off.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/btn_no_off.png.png b/email2/res/drawable-hdpi/btn_no_off.png.png deleted file mode 100644 index f88b5a725..000000000 Binary files a/email2/res/drawable-hdpi/btn_no_off.png.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/btn_star_off_convo_holo_light.png b/email2/res/drawable-hdpi/btn_star_off_convo_holo_light.png deleted file mode 100644 index 8d0c6c29e..000000000 Binary files a/email2/res/drawable-hdpi/btn_star_off_convo_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png b/email2/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png deleted file mode 100644 index 5076fbf0d..000000000 Binary files a/email2/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/btn_star_on_convo_holo_light.png b/email2/res/drawable-hdpi/btn_star_on_convo_holo_light.png deleted file mode 100644 index 718186ae3..000000000 Binary files a/email2/res/drawable-hdpi/btn_star_on_convo_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png b/email2/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png deleted file mode 100644 index 3042cb75c..000000000 Binary files a/email2/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/btn_yes_off.png.png b/email2/res/drawable-hdpi/btn_yes_off.png.png deleted file mode 100644 index 94e14806b..000000000 Binary files a/email2/res/drawable-hdpi/btn_yes_off.png.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/divider_horizontal_holo_light.9.png b/email2/res/drawable-hdpi/divider_horizontal_holo_light.9.png deleted file mode 100644 index 064cf07de..000000000 Binary files a/email2/res/drawable-hdpi/divider_horizontal_holo_light.9.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/expander_close_holo_light.9.png b/email2/res/drawable-hdpi/expander_close_holo_light.9.png deleted file mode 100644 index 2dd454837..000000000 Binary files a/email2/res/drawable-hdpi/expander_close_holo_light.9.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/expander_open_holo_light.9.png b/email2/res/drawable-hdpi/expander_open_holo_light.9.png deleted file mode 100644 index 7cec83ad5..000000000 Binary files a/email2/res/drawable-hdpi/expander_open_holo_light.9.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png b/email2/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png deleted file mode 100644 index 0ed36dfa8..000000000 Binary files a/email2/res/drawable-hdpi/gradient_bg_email_widget_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/header_bg_email_widget_holo.9.png b/email2/res/drawable-hdpi/header_bg_email_widget_holo.9.png deleted file mode 100644 index 6216ba3c3..000000000 Binary files a/email2/res/drawable-hdpi/header_bg_email_widget_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/header_convo_view_sender_bg_holo.9.png b/email2/res/drawable-hdpi/header_convo_view_sender_bg_holo.9.png deleted file mode 100644 index bfc020e24..000000000 Binary files a/email2/res/drawable-hdpi/header_convo_view_sender_bg_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_badge_attachment.png b/email2/res/drawable-hdpi/ic_badge_attachment.png deleted file mode 100644 index a3db7ef5d..000000000 Binary files a/email2/res/drawable-hdpi/ic_badge_attachment.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_folder_drafts_holo_light.png b/email2/res/drawable-hdpi/ic_folder_drafts_holo_light.png deleted file mode 100644 index bf2e74767..000000000 Binary files a/email2/res/drawable-hdpi/ic_folder_drafts_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_folder_inbox_holo_light.png b/email2/res/drawable-hdpi/ic_folder_inbox_holo_light.png deleted file mode 100644 index df0ac0d5d..000000000 Binary files a/email2/res/drawable-hdpi/ic_folder_inbox_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_folder_outbox_holo_light.png b/email2/res/drawable-hdpi/ic_folder_outbox_holo_light.png deleted file mode 100644 index c8ba6a2a5..000000000 Binary files a/email2/res/drawable-hdpi/ic_folder_outbox_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_folder_sent_holo_light.png b/email2/res/drawable-hdpi/ic_folder_sent_holo_light.png deleted file mode 100644 index 72d563908..000000000 Binary files a/email2/res/drawable-hdpi/ic_folder_sent_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_forward_holo_dark.png b/email2/res/drawable-hdpi/ic_forward_holo_dark.png deleted file mode 100644 index 1f1349df8..000000000 Binary files a/email2/res/drawable-hdpi/ic_forward_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_list_combined_inbox.png b/email2/res/drawable-hdpi/ic_list_combined_inbox.png deleted file mode 100644 index a70ad8eed..000000000 Binary files a/email2/res/drawable-hdpi/ic_list_combined_inbox.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png b/email2/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png deleted file mode 100644 index 2c395b800..000000000 Binary files a/email2/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_compose_normal_holo_light.png b/email2/res/drawable-hdpi/ic_menu_compose_normal_holo_light.png deleted file mode 100644 index b590822e4..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_compose_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_mark_read_holo_light.png b/email2/res/drawable-hdpi/ic_menu_mark_read_holo_light.png deleted file mode 100644 index e2f898ce3..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_mark_read_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_mark_unread_holo_light.png b/email2/res/drawable-hdpi/ic_menu_mark_unread_holo_light.png deleted file mode 100644 index d8d8f285b..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_mark_unread_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_refresh_holo_light.png b/email2/res/drawable-hdpi/ic_menu_refresh_holo_light.png deleted file mode 100644 index 8591b6973..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_refresh_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_search_holo_light.png b/email2/res/drawable-hdpi/ic_menu_search_holo_light.png deleted file mode 100644 index dae6979ae..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_search_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_send_disabled_holo_light.png b/email2/res/drawable-hdpi/ic_menu_send_disabled_holo_light.png deleted file mode 100644 index 24232e400..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_send_disabled_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_send_holo_light.png b/email2/res/drawable-hdpi/ic_menu_send_holo_light.png deleted file mode 100644 index 95fc4fc2a..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_send_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_send_normal_holo_light.png b/email2/res/drawable-hdpi/ic_menu_send_normal_holo_light.png deleted file mode 100644 index 0aa3651d1..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_send_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_star_holo_light.png b/email2/res/drawable-hdpi/ic_menu_star_holo_light.png deleted file mode 100644 index 3051ead55..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_star_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_star_off_holo_light.png b/email2/res/drawable-hdpi/ic_menu_star_off_holo_light.png deleted file mode 100644 index 257abf7c0..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_star_off_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_menu_trash_holo_light.png b/email2/res/drawable-hdpi/ic_menu_trash_holo_light.png deleted file mode 100644 index 47676f074..000000000 Binary files a/email2/res/drawable-hdpi/ic_menu_trash_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png b/email2/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png index dc73d2e99..4c24026f0 100644 Binary files a/email2/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png and b/email2/res/drawable-hdpi/ic_newer_arrow_disabled_holo_light.png differ diff --git a/email2/res/drawable-hdpi/ic_newer_arrow_holo_light.png b/email2/res/drawable-hdpi/ic_newer_arrow_holo_light.png index 065bdd6e7..02d528909 100644 Binary files a/email2/res/drawable-hdpi/ic_newer_arrow_holo_light.png and b/email2/res/drawable-hdpi/ic_newer_arrow_holo_light.png differ diff --git a/email2/res/drawable-hdpi/ic_notification_multiple_mail_holo_dark.png b/email2/res/drawable-hdpi/ic_notification_multiple_mail_holo_dark.png deleted file mode 100644 index a733c2add..000000000 Binary files a/email2/res/drawable-hdpi/ic_notification_multiple_mail_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png b/email2/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png index 6a08afa30..1e5a11d93 100644 Binary files a/email2/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png and b/email2/res/drawable-hdpi/ic_older_arrow_disabled_holo_light.png differ diff --git a/email2/res/drawable-hdpi/ic_older_arrow_holo_light.png b/email2/res/drawable-hdpi/ic_older_arrow_holo_light.png index 47cbf8676..3b72b1329 100644 Binary files a/email2/res/drawable-hdpi/ic_older_arrow_holo_light.png and b/email2/res/drawable-hdpi/ic_older_arrow_holo_light.png differ diff --git a/email2/res/drawable-hdpi/ic_remove_attachment_holo_light.png b/email2/res/drawable-hdpi/ic_remove_attachment_holo_light.png deleted file mode 100644 index fe4bd8998..000000000 Binary files a/email2/res/drawable-hdpi/ic_remove_attachment_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_reply.png b/email2/res/drawable-hdpi/ic_reply.png deleted file mode 100644 index 0816a5129..000000000 Binary files a/email2/res/drawable-hdpi/ic_reply.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_reply_all.png b/email2/res/drawable-hdpi/ic_reply_all.png deleted file mode 100644 index 0da72bb13..000000000 Binary files a/email2/res/drawable-hdpi/ic_reply_all.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_reply_all_holo_dark.png b/email2/res/drawable-hdpi/ic_reply_all_holo_dark.png deleted file mode 100644 index 26bdd1868..000000000 Binary files a/email2/res/drawable-hdpi/ic_reply_all_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_reply_holo_dark.png b/email2/res/drawable-hdpi/ic_reply_holo_dark.png deleted file mode 100644 index 41acf9d00..000000000 Binary files a/email2/res/drawable-hdpi/ic_reply_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_show_images_holo_light.png b/email2/res/drawable-hdpi/ic_show_images_holo_light.png deleted file mode 100644 index c5ae5953f..000000000 Binary files a/email2/res/drawable-hdpi/ic_show_images_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/ic_spam_normal_holo_light.png b/email2/res/drawable-hdpi/ic_spam_normal_holo_light.png deleted file mode 100644 index 21a0fa639..000000000 Binary files a/email2/res/drawable-hdpi/ic_spam_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png b/email2/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png deleted file mode 100644 index 8c54379ef..000000000 Binary files a/email2/res/drawable-hdpi/list_div_top_btm_email_widget_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/attachment_bg_holo.9.png b/email2/res/drawable-mdpi/attachment_bg_holo.9.png deleted file mode 100644 index 040bbd04d..000000000 Binary files a/email2/res/drawable-mdpi/attachment_bg_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/btn_check_off_normal_holo_light.png b/email2/res/drawable-mdpi/btn_check_off_normal_holo_light.png deleted file mode 100644 index f1b9c7ace..000000000 Binary files a/email2/res/drawable-mdpi/btn_check_off_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/btn_check_on_normal_holo_light.png b/email2/res/drawable-mdpi/btn_check_on_normal_holo_light.png deleted file mode 100644 index aede5316a..000000000 Binary files a/email2/res/drawable-mdpi/btn_check_on_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/btn_maybe_off.png b/email2/res/drawable-mdpi/btn_maybe_off.png deleted file mode 100644 index 2a22a27ce..000000000 Binary files a/email2/res/drawable-mdpi/btn_maybe_off.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/btn_no_off.png.png b/email2/res/drawable-mdpi/btn_no_off.png.png deleted file mode 100644 index 4e8590e46..000000000 Binary files a/email2/res/drawable-mdpi/btn_no_off.png.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/btn_star_off_convo_holo_light.png b/email2/res/drawable-mdpi/btn_star_off_convo_holo_light.png deleted file mode 100644 index af65e65c6..000000000 Binary files a/email2/res/drawable-mdpi/btn_star_off_convo_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png b/email2/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png deleted file mode 100644 index 7c0d5ad90..000000000 Binary files a/email2/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/btn_star_on_convo_holo_light.png b/email2/res/drawable-mdpi/btn_star_on_convo_holo_light.png deleted file mode 100644 index 1c2997a1d..000000000 Binary files a/email2/res/drawable-mdpi/btn_star_on_convo_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png b/email2/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png deleted file mode 100644 index 23a63b46f..000000000 Binary files a/email2/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/btn_yes_off.png.png b/email2/res/drawable-mdpi/btn_yes_off.png.png deleted file mode 100644 index 0bad66971..000000000 Binary files a/email2/res/drawable-mdpi/btn_yes_off.png.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/divider_horizontal_holo_light.9.png b/email2/res/drawable-mdpi/divider_horizontal_holo_light.9.png deleted file mode 100644 index 064cf07de..000000000 Binary files a/email2/res/drawable-mdpi/divider_horizontal_holo_light.9.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/expander_close_holo_light.9.png b/email2/res/drawable-mdpi/expander_close_holo_light.9.png deleted file mode 100644 index 2ea966809..000000000 Binary files a/email2/res/drawable-mdpi/expander_close_holo_light.9.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/expander_open_holo_light.9.png b/email2/res/drawable-mdpi/expander_open_holo_light.9.png deleted file mode 100644 index 28b9ec76f..000000000 Binary files a/email2/res/drawable-mdpi/expander_open_holo_light.9.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png b/email2/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png deleted file mode 100644 index 8d319d1d7..000000000 Binary files a/email2/res/drawable-mdpi/gradient_bg_email_widget_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/header_bg_email_widget_holo.9.png b/email2/res/drawable-mdpi/header_bg_email_widget_holo.9.png deleted file mode 100644 index 500cc4c41..000000000 Binary files a/email2/res/drawable-mdpi/header_bg_email_widget_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/header_convo_view_sender_bg_holo.9.png b/email2/res/drawable-mdpi/header_convo_view_sender_bg_holo.9.png deleted file mode 100644 index 2afef3c34..000000000 Binary files a/email2/res/drawable-mdpi/header_convo_view_sender_bg_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_badge_attachment.png b/email2/res/drawable-mdpi/ic_badge_attachment.png deleted file mode 100644 index 7ce9ecf30..000000000 Binary files a/email2/res/drawable-mdpi/ic_badge_attachment.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_folder_drafts_holo_light.png b/email2/res/drawable-mdpi/ic_folder_drafts_holo_light.png deleted file mode 100644 index 6db6c812c..000000000 Binary files a/email2/res/drawable-mdpi/ic_folder_drafts_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_folder_inbox_holo_light.png b/email2/res/drawable-mdpi/ic_folder_inbox_holo_light.png deleted file mode 100644 index 62f67d29b..000000000 Binary files a/email2/res/drawable-mdpi/ic_folder_inbox_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_folder_outbox_holo_light.png b/email2/res/drawable-mdpi/ic_folder_outbox_holo_light.png deleted file mode 100644 index a7039e12e..000000000 Binary files a/email2/res/drawable-mdpi/ic_folder_outbox_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_folder_sent_holo_light.png b/email2/res/drawable-mdpi/ic_folder_sent_holo_light.png deleted file mode 100644 index ca93d583b..000000000 Binary files a/email2/res/drawable-mdpi/ic_folder_sent_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_forward_holo_dark.png b/email2/res/drawable-mdpi/ic_forward_holo_dark.png deleted file mode 100644 index 0894ce5e3..000000000 Binary files a/email2/res/drawable-mdpi/ic_forward_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_list_combined_inbox.png b/email2/res/drawable-mdpi/ic_list_combined_inbox.png deleted file mode 100644 index 1d3bde131..000000000 Binary files a/email2/res/drawable-mdpi/ic_list_combined_inbox.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png b/email2/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png deleted file mode 100644 index 5b1a81593..000000000 Binary files a/email2/res/drawable-mdpi/ic_mailbox_collapsed_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_compose_normal_holo_light.png b/email2/res/drawable-mdpi/ic_menu_compose_normal_holo_light.png deleted file mode 100644 index 4f194f891..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_compose_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_mark_read_holo_light.png b/email2/res/drawable-mdpi/ic_menu_mark_read_holo_light.png deleted file mode 100644 index 05294de50..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_mark_read_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_mark_unread_holo_light.png b/email2/res/drawable-mdpi/ic_menu_mark_unread_holo_light.png deleted file mode 100644 index 21adb5e6c..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_mark_unread_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_refresh_holo_light.png b/email2/res/drawable-mdpi/ic_menu_refresh_holo_light.png deleted file mode 100644 index 362179827..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_refresh_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_search_holo_light.png b/email2/res/drawable-mdpi/ic_menu_search_holo_light.png deleted file mode 100644 index 2769fd2a6..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_search_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_send_disabled_holo_light.png b/email2/res/drawable-mdpi/ic_menu_send_disabled_holo_light.png deleted file mode 100644 index f013053b5..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_send_disabled_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_send_holo_light.png b/email2/res/drawable-mdpi/ic_menu_send_holo_light.png deleted file mode 100644 index e90a8c1ba..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_send_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_send_normal_holo_light.png b/email2/res/drawable-mdpi/ic_menu_send_normal_holo_light.png deleted file mode 100644 index 3275d70ae..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_send_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_star_holo_light.png b/email2/res/drawable-mdpi/ic_menu_star_holo_light.png deleted file mode 100644 index e9ab7efc0..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_star_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_star_off_holo_light.png b/email2/res/drawable-mdpi/ic_menu_star_off_holo_light.png deleted file mode 100644 index 15f58453e..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_star_off_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_menu_trash_holo_light.png b/email2/res/drawable-mdpi/ic_menu_trash_holo_light.png deleted file mode 100644 index 7e7c3fe8a..000000000 Binary files a/email2/res/drawable-mdpi/ic_menu_trash_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png b/email2/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png deleted file mode 100644 index 8071c272d..000000000 Binary files a/email2/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_remove_attachment_holo_light.png b/email2/res/drawable-mdpi/ic_remove_attachment_holo_light.png deleted file mode 100644 index 677c1ca19..000000000 Binary files a/email2/res/drawable-mdpi/ic_remove_attachment_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_reply.png b/email2/res/drawable-mdpi/ic_reply.png deleted file mode 100644 index 55288fa96..000000000 Binary files a/email2/res/drawable-mdpi/ic_reply.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_reply_all.png b/email2/res/drawable-mdpi/ic_reply_all.png deleted file mode 100644 index 4cb89d67f..000000000 Binary files a/email2/res/drawable-mdpi/ic_reply_all.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_reply_all_holo_dark.png b/email2/res/drawable-mdpi/ic_reply_all_holo_dark.png deleted file mode 100644 index aa1f3cdd2..000000000 Binary files a/email2/res/drawable-mdpi/ic_reply_all_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_reply_holo_dark.png b/email2/res/drawable-mdpi/ic_reply_holo_dark.png deleted file mode 100644 index 303b296a0..000000000 Binary files a/email2/res/drawable-mdpi/ic_reply_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_show_images_holo_light.png b/email2/res/drawable-mdpi/ic_show_images_holo_light.png deleted file mode 100644 index 46c9e51f3..000000000 Binary files a/email2/res/drawable-mdpi/ic_show_images_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/ic_spam_normal_holo_light.png b/email2/res/drawable-mdpi/ic_spam_normal_holo_light.png deleted file mode 100644 index 5abe49320..000000000 Binary files a/email2/res/drawable-mdpi/ic_spam_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png b/email2/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png deleted file mode 100644 index 7d59de26c..000000000 Binary files a/email2/res/drawable-mdpi/list_div_top_btm_email_widget_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-nodpi/email_widget_preview.png b/email2/res/drawable-nodpi/email_widget_preview.png deleted file mode 100644 index ba66702dd..000000000 Binary files a/email2/res/drawable-nodpi/email_widget_preview.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png b/email2/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png deleted file mode 100644 index 402bef332..000000000 Binary files a/email2/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png b/email2/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png deleted file mode 100644 index 0e49c5e9b..000000000 Binary files a/email2/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png b/email2/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png deleted file mode 100644 index 985ca74c9..000000000 Binary files a/email2/res/drawable-sw600dp-hdpi/btn_star_off_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png b/email2/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png deleted file mode 100644 index f500c6754..000000000 Binary files a/email2/res/drawable-sw600dp-hdpi/btn_star_on_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png b/email2/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png deleted file mode 100644 index f1b9c7ace..000000000 Binary files a/email2/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png b/email2/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png deleted file mode 100644 index aede5316a..000000000 Binary files a/email2/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png b/email2/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png deleted file mode 100644 index a4d414043..000000000 Binary files a/email2/res/drawable-sw600dp-mdpi/btn_star_off_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png b/email2/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png deleted file mode 100644 index fb9324706..000000000 Binary files a/email2/res/drawable-sw600dp-mdpi/btn_star_on_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png b/email2/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png deleted file mode 100644 index 2863acf82..000000000 Binary files a/email2/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png b/email2/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png deleted file mode 100644 index 121986c2d..000000000 Binary files a/email2/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png b/email2/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png deleted file mode 100644 index e740d9bc0..000000000 Binary files a/email2/res/drawable-sw600dp-xhdpi/btn_star_off_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png b/email2/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png deleted file mode 100644 index c5154174e..000000000 Binary files a/email2/res/drawable-sw600dp-xhdpi/btn_star_on_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/attachment_bg_holo.9.png b/email2/res/drawable-xhdpi/attachment_bg_holo.9.png deleted file mode 100644 index b59af1df1..000000000 Binary files a/email2/res/drawable-xhdpi/attachment_bg_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/btn_check_off_normal_holo_light.png b/email2/res/drawable-xhdpi/btn_check_off_normal_holo_light.png deleted file mode 100644 index d3809fa13..000000000 Binary files a/email2/res/drawable-xhdpi/btn_check_off_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/btn_check_on_normal_holo_light.png b/email2/res/drawable-xhdpi/btn_check_on_normal_holo_light.png deleted file mode 100644 index 7e1bc8cba..000000000 Binary files a/email2/res/drawable-xhdpi/btn_check_on_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/btn_maybe_off.png b/email2/res/drawable-xhdpi/btn_maybe_off.png deleted file mode 100644 index 59c7a4ad1..000000000 Binary files a/email2/res/drawable-xhdpi/btn_maybe_off.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/btn_no_off.png.png b/email2/res/drawable-xhdpi/btn_no_off.png.png deleted file mode 100644 index c8bcae49b..000000000 Binary files a/email2/res/drawable-xhdpi/btn_no_off.png.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/btn_star_off_convo_holo_light.png b/email2/res/drawable-xhdpi/btn_star_off_convo_holo_light.png deleted file mode 100644 index 8edd94cd3..000000000 Binary files a/email2/res/drawable-xhdpi/btn_star_off_convo_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png b/email2/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png deleted file mode 100644 index 7129d0016..000000000 Binary files a/email2/res/drawable-xhdpi/btn_star_off_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/btn_star_on_convo_holo_light.png b/email2/res/drawable-xhdpi/btn_star_on_convo_holo_light.png deleted file mode 100644 index 1974ca690..000000000 Binary files a/email2/res/drawable-xhdpi/btn_star_on_convo_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png b/email2/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png deleted file mode 100644 index d91c8bceb..000000000 Binary files a/email2/res/drawable-xhdpi/btn_star_on_normal_email_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/btn_yes_off.png.png b/email2/res/drawable-xhdpi/btn_yes_off.png.png deleted file mode 100644 index 97d169b61..000000000 Binary files a/email2/res/drawable-xhdpi/btn_yes_off.png.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/divider_horizontal_holo_light.9.png b/email2/res/drawable-xhdpi/divider_horizontal_holo_light.9.png deleted file mode 100644 index ce444863c..000000000 Binary files a/email2/res/drawable-xhdpi/divider_horizontal_holo_light.9.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/expander_close_holo_light.9.png b/email2/res/drawable-xhdpi/expander_close_holo_light.9.png deleted file mode 100644 index 333dd24db..000000000 Binary files a/email2/res/drawable-xhdpi/expander_close_holo_light.9.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/expander_open_holo_light.9.png b/email2/res/drawable-xhdpi/expander_open_holo_light.9.png deleted file mode 100644 index 67ed4c0a1..000000000 Binary files a/email2/res/drawable-xhdpi/expander_open_holo_light.9.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/gradient_bg_email_widget_holo.9.png b/email2/res/drawable-xhdpi/gradient_bg_email_widget_holo.9.png deleted file mode 100644 index b481cade3..000000000 Binary files a/email2/res/drawable-xhdpi/gradient_bg_email_widget_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/header_bg_email_widget_holo.9.png b/email2/res/drawable-xhdpi/header_bg_email_widget_holo.9.png deleted file mode 100644 index fa411415d..000000000 Binary files a/email2/res/drawable-xhdpi/header_bg_email_widget_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/header_convo_view_sender_bg_holo.9.png b/email2/res/drawable-xhdpi/header_convo_view_sender_bg_holo.9.png deleted file mode 100644 index 3f57a7bc6..000000000 Binary files a/email2/res/drawable-xhdpi/header_convo_view_sender_bg_holo.9.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_badge_attachment.png b/email2/res/drawable-xhdpi/ic_badge_attachment.png deleted file mode 100644 index 8376cdf6e..000000000 Binary files a/email2/res/drawable-xhdpi/ic_badge_attachment.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_folder_drafts_holo_light.png b/email2/res/drawable-xhdpi/ic_folder_drafts_holo_light.png deleted file mode 100644 index 52c80368d..000000000 Binary files a/email2/res/drawable-xhdpi/ic_folder_drafts_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_folder_inbox_holo_light.png b/email2/res/drawable-xhdpi/ic_folder_inbox_holo_light.png deleted file mode 100644 index 11a61b895..000000000 Binary files a/email2/res/drawable-xhdpi/ic_folder_inbox_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_folder_outbox_holo_light.png b/email2/res/drawable-xhdpi/ic_folder_outbox_holo_light.png deleted file mode 100644 index dcd34485d..000000000 Binary files a/email2/res/drawable-xhdpi/ic_folder_outbox_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_folder_sent_holo_light.png b/email2/res/drawable-xhdpi/ic_folder_sent_holo_light.png deleted file mode 100644 index 0baa77ce7..000000000 Binary files a/email2/res/drawable-xhdpi/ic_folder_sent_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_forward_holo_dark.png b/email2/res/drawable-xhdpi/ic_forward_holo_dark.png deleted file mode 100644 index b36b81a05..000000000 Binary files a/email2/res/drawable-xhdpi/ic_forward_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_list_combined_inbox.png b/email2/res/drawable-xhdpi/ic_list_combined_inbox.png deleted file mode 100644 index 11a61b895..000000000 Binary files a/email2/res/drawable-xhdpi/ic_list_combined_inbox.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_mailbox_collapsed_holo_light.png b/email2/res/drawable-xhdpi/ic_mailbox_collapsed_holo_light.png deleted file mode 100644 index 132282e97..000000000 Binary files a/email2/res/drawable-xhdpi/ic_mailbox_collapsed_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_compose_normal_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_compose_normal_holo_light.png deleted file mode 100644 index a2d821ae3..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_compose_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_mark_read_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_mark_read_holo_light.png deleted file mode 100644 index cfd5e34e9..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_mark_read_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_mark_unread_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_mark_unread_holo_light.png deleted file mode 100644 index f023cb023..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_mark_unread_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_refresh_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_refresh_holo_light.png deleted file mode 100644 index 9b4a49d0a..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_refresh_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_search_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_search_holo_light.png deleted file mode 100644 index 4c6aade68..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_search_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_send_disabled_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_send_disabled_holo_light.png deleted file mode 100644 index b3143f63b..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_send_disabled_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_send_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_send_holo_light.png deleted file mode 100644 index 9f4c7973c..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_send_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_send_normal_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_send_normal_holo_light.png deleted file mode 100644 index 294f4769e..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_send_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_star_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_star_holo_light.png deleted file mode 100644 index b69c03485..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_star_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_star_off_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_star_off_holo_light.png deleted file mode 100644 index b7417f1b4..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_star_off_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_menu_trash_holo_light.png b/email2/res/drawable-xhdpi/ic_menu_trash_holo_light.png deleted file mode 100644 index 203ba4c40..000000000 Binary files a/email2/res/drawable-xhdpi/ic_menu_trash_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_notification_multiple_mail_holo_dark.png b/email2/res/drawable-xhdpi/ic_notification_multiple_mail_holo_dark.png deleted file mode 100644 index 03bf26cec..000000000 Binary files a/email2/res/drawable-xhdpi/ic_notification_multiple_mail_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_remove_attachment_holo_light.png b/email2/res/drawable-xhdpi/ic_remove_attachment_holo_light.png deleted file mode 100644 index 587910522..000000000 Binary files a/email2/res/drawable-xhdpi/ic_remove_attachment_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_reply.png b/email2/res/drawable-xhdpi/ic_reply.png deleted file mode 100644 index 01467a472..000000000 Binary files a/email2/res/drawable-xhdpi/ic_reply.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_reply_all.png b/email2/res/drawable-xhdpi/ic_reply_all.png deleted file mode 100644 index 8761b7572..000000000 Binary files a/email2/res/drawable-xhdpi/ic_reply_all.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_reply_all_holo_dark.png b/email2/res/drawable-xhdpi/ic_reply_all_holo_dark.png deleted file mode 100644 index 3852a1d29..000000000 Binary files a/email2/res/drawable-xhdpi/ic_reply_all_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_reply_holo_dark.png b/email2/res/drawable-xhdpi/ic_reply_holo_dark.png deleted file mode 100644 index 6fccf467e..000000000 Binary files a/email2/res/drawable-xhdpi/ic_reply_holo_dark.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_show_images_holo_light.png b/email2/res/drawable-xhdpi/ic_show_images_holo_light.png deleted file mode 100644 index 571bc57a9..000000000 Binary files a/email2/res/drawable-xhdpi/ic_show_images_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/ic_spam_normal_holo_light.png b/email2/res/drawable-xhdpi/ic_spam_normal_holo_light.png deleted file mode 100644 index 4edbfe06d..000000000 Binary files a/email2/res/drawable-xhdpi/ic_spam_normal_holo_light.png and /dev/null differ diff --git a/email2/res/drawable-xhdpi/list_div_top_btm_email_widget_holo.9.png b/email2/res/drawable-xhdpi/list_div_top_btm_email_widget_holo.9.png deleted file mode 100644 index 6934c5f0e..000000000 Binary files a/email2/res/drawable-xhdpi/list_div_top_btm_email_widget_holo.9.png and /dev/null differ diff --git a/email2/res/drawable/attachment_background.xml b/email2/res/drawable/attachment_background.xml deleted file mode 100644 index 559d33fa7..000000000 --- a/email2/res/drawable/attachment_background.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/email2/res/menu-sw600dp/email_activity_options.xml b/email2/res/menu-sw600dp/email_activity_options.xml deleted file mode 100644 index 71aebb78c..000000000 --- a/email2/res/menu-sw600dp/email_activity_options.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/email2/res/menu-sw600dp/message_compose_option.xml b/email2/res/menu-sw600dp/message_compose_option.xml deleted file mode 100644 index 617c868bd..000000000 --- a/email2/res/menu-sw600dp/message_compose_option.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - diff --git a/email2/res/menu-sw600dp/message_view_fragment_option.xml b/email2/res/menu-sw600dp/message_view_fragment_option.xml deleted file mode 100644 index 41a60f13c..000000000 --- a/email2/res/menu-sw600dp/message_view_fragment_option.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - diff --git a/email2/res/menu/email_activity_options.xml b/email2/res/menu/email_activity_options.xml deleted file mode 100644 index 33ee507ef..000000000 --- a/email2/res/menu/email_activity_options.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/email2/res/menu/message_compose_option.xml b/email2/res/menu/message_compose_option.xml deleted file mode 100644 index d3b13f1e9..000000000 --- a/email2/res/menu/message_compose_option.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - diff --git a/email2/res/menu/message_header_overflow_menu.xml b/email2/res/menu/message_header_overflow_menu.xml deleted file mode 100644 index 8ba33f1cc..000000000 --- a/email2/res/menu/message_header_overflow_menu.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - diff --git a/email2/res/menu/message_list_fragment_cab_options.xml b/email2/res/menu/message_list_fragment_cab_options.xml deleted file mode 100644 index 848dd0ce3..000000000 --- a/email2/res/menu/message_list_fragment_cab_options.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - diff --git a/email2/res/menu/message_list_fragment_option.xml b/email2/res/menu/message_list_fragment_option.xml deleted file mode 100644 index df0796437..000000000 --- a/email2/res/menu/message_list_fragment_option.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/email2/res/menu/message_view_fragment_option.xml b/email2/res/menu/message_view_fragment_option.xml deleted file mode 100644 index 845c822dc..000000000 --- a/email2/res/menu/message_view_fragment_option.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - diff --git a/email2/res/menu/welcome.xml b/email2/res/menu/welcome.xml deleted file mode 100644 index 4f0cd47f2..000000000 --- a/email2/res/menu/welcome.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/email2/res/values/arrays.xml b/email2/res/values/arrays.xml index 6232e6527..a6c02d4cf 100644 --- a/email2/res/values/arrays.xml +++ b/email2/res/values/arrays.xml @@ -193,27 +193,6 @@ @string/quick_4 - - - - @drawable/ic_folder_inbox_holo_light - - - - - - @drawable/ic_folder_drafts_holo_light - - @drawable/ic_folder_outbox_holo_light - - @drawable/ic_folder_sent_holo_light - - @drawable/ic_menu_trash_holo_light - - @drawable/ic_spam_normal_holo_light - - @color/combined_view_account_color_1 diff --git a/email2/src/com/android/email/FolderProperties.java b/email2/src/com/android/email/FolderProperties.java deleted file mode 100644 index 86c902139..000000000 --- a/email2/src/com/android/email/FolderProperties.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * Copyright (C) 2011 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. - */ - -package com.android.email; - -import com.android.emailcommon.provider.EmailContent.MailboxColumns; -import com.android.emailcommon.provider.EmailContent.Message; -import com.android.emailcommon.provider.Mailbox; -import com.google.common.base.Preconditions; - -import android.content.Context; -import android.content.res.TypedArray; -import android.database.Cursor; -import android.graphics.drawable.Drawable; - - -// TODO When the UI is settled, cache all strings/drawables -/** - * Stores names and icons for system folders. System folders are those with special - * meaning, such as Inbox, Drafts, Trash, etc... Although these folders may or may - * not exist on the server, we want to ensure they are displayed in a very specific - * manner. - * - * Some methods probably should belong to {@link Mailbox}, but as this class uses resources, - * we can't move them to emailcommon... - */ -public class FolderProperties { - - private static FolderProperties sInstance; - - private final Context mContext; - - // Caches for frequently accessed resources. - private final String[] mSpecialMailbox; - private final TypedArray mSpecialMailboxDrawable; - private final Drawable mSummaryStarredMailboxDrawable; - private final Drawable mSummaryCombinedInboxDrawable; - - private FolderProperties(Context context) { - mContext = context.getApplicationContext(); - mSpecialMailbox = context.getResources().getStringArray(R.array.mailbox_display_names); - for (int i = 0; i < mSpecialMailbox.length; ++i) { - if ("".equals(mSpecialMailbox[i])) { - // there is no localized name, so use the display name from the server - mSpecialMailbox[i] = null; - } - } - mSpecialMailboxDrawable = - context.getResources().obtainTypedArray(R.array.mailbox_display_icons); - mSummaryStarredMailboxDrawable = - context.getResources().getDrawable(R.drawable.ic_menu_star_holo_light); - mSummaryCombinedInboxDrawable = - context.getResources().getDrawable(R.drawable.ic_list_combined_inbox); - } - - public static synchronized FolderProperties getInstance(Context context) { - if (sInstance == null) { - sInstance = new FolderProperties(context); - } - return sInstance; - } - - public String getCombinedMailboxName(long mailboxId) { - // Special combined mailboxes - int resId = 0; - - // Can't use long for switch!? - if (mailboxId == Mailbox.QUERY_ALL_INBOXES) { - resId = R.string.account_folder_list_summary_inbox; - } else if (mailboxId == Mailbox.QUERY_ALL_FAVORITES) { - resId = R.string.account_folder_list_summary_starred; - } else if (mailboxId == Mailbox.QUERY_ALL_DRAFTS) { - resId = R.string.account_folder_list_summary_drafts; - } else if (mailboxId == Mailbox.QUERY_ALL_OUTBOX) { - resId = R.string.account_folder_list_summary_outbox; - } - if (resId != 0) { - return mContext.getString(resId); - } - return null; - } - - /** - * Lookup names of localized special mailboxes - */ - private String getDisplayName(int type, long mailboxId) { - String name = getCombinedMailboxName(mailboxId); - - if ((name == null) && (type < mSpecialMailbox.length)) { - name = mSpecialMailbox[type]; - } - return name; - } - - /** - * Return the display name for a mailbox for UI. For normal mailboxes, it just returns - * {@code originalDisplayName}, but for special mailboxes (such as combined mailboxes) it - * returns a name obtained from the resource. - * - * @param mailboxType Such as {@link Mailbox#TYPE_INBOX} - * @param mailboxId ID of a mailbox. - * @param originalDisplayName Display name of the mailbox stored in the database. - */ - public String getDisplayName(int mailboxType, long mailboxId, String originalDisplayName) { - String name = getDisplayName(mailboxType, mailboxId); - if (name != null) { - return name; - } - return originalDisplayName; - } - - /** - * Same as {@link #getDisplayName(int, long, String)}, but gets information form a mailbox - * cursor. The cursor must contain the following columns: - * {@link MailboxColumns#ID}, {@link MailboxColumns#TYPE} and - * {@link MailboxColumns#DISPLAY_NAME}. - */ - public String getDisplayName(Cursor mailboxCursor) { - final Cursor c = mailboxCursor; - return getDisplayName( - c.getInt(c.getColumnIndex(MailboxColumns.TYPE)), - c.getLong(c.getColumnIndex(MailboxColumns.ID)), - c.getString(c.getColumnIndex(MailboxColumns.DISPLAY_NAME)) - ); - } - - public String getDisplayName(Mailbox mailbox) { - return getDisplayName(mailbox.mType, mailbox.mId, mailbox.mDisplayName); - } - - /** - * Return the message count which should be shown with a mailbox name. Depending on - * the mailbox type, we change what to show. - * - * @param mailboxType Such as {@link Mailbox#TYPE_INBOX} - * @param unreadCount Count obtained from {@link MailboxColumns#UNREAD_COUNT} - * @param totalCount Count obtained from {@link MailboxColumns#MESSAGE_COUNT} - */ - public int getMessageCount(int mailboxType, int unreadCount, int totalCount) { - switch (mailboxType) { - case Mailbox.TYPE_DRAFTS: - case Mailbox.TYPE_OUTBOX: - return totalCount; - case Mailbox.TYPE_SENT: - case Mailbox.TYPE_TRASH: - return 0; // We don't show a count for sent/trash. - } - return unreadCount; - } - - /** - * Same as {@link #getMessageCount(int, int, int)}, but gets information form a mailbox - * cursor. The cursor must contain the following columns: - * {@link MailboxColumns#TYPE}, {@link MailboxColumns#UNREAD_COUNT} and - * {@link MailboxColumns#MESSAGE_COUNT}. - */ - public int getMessageCount(Cursor mailboxCursor) { - final Cursor c = mailboxCursor; - return getMessageCount( - c.getInt(c.getColumnIndex(MailboxColumns.TYPE)), - c.getInt(c.getColumnIndex(MailboxColumns.UNREAD_COUNT)), - c.getInt(c.getColumnIndex(MailboxColumns.MESSAGE_COUNT)) - ); - } - - /** - * @return message count to show for the UI for a combined inbox. - * - * Note this method doesn't use mContext so we can inject a mock context for provider - * access. So it's static. - */ - public static int getMessageCountForCombinedMailbox(Context context, long mailboxId) { - Preconditions.checkState(mailboxId < -1L); - if ((mailboxId == Mailbox.QUERY_ALL_INBOXES) - || (mailboxId == Mailbox.QUERY_ALL_UNREAD)) { - return Mailbox.getUnreadCountByMailboxType(context, Mailbox.TYPE_INBOX); - - } else if (mailboxId == Mailbox.QUERY_ALL_FAVORITES) { - return Message.getFavoriteMessageCount(context); - - } else if (mailboxId == Mailbox.QUERY_ALL_DRAFTS) { - return Mailbox.getMessageCountByMailboxType(context, Mailbox.TYPE_DRAFTS); - - } else if (mailboxId == Mailbox.QUERY_ALL_OUTBOX) { - return Mailbox.getMessageCountByMailboxType(context, Mailbox.TYPE_OUTBOX); - } - throw new IllegalStateException("Invalid mailbox ID"); - } - - /** - * Lookup icons of special mailboxes - */ - public Drawable getIcon(int type, long mailboxId, int mailboxFlags) { - if (mailboxId == Mailbox.QUERY_ALL_INBOXES) { - return mSummaryCombinedInboxDrawable; - } else if (mailboxId == Mailbox.QUERY_ALL_FAVORITES) { - return mSummaryStarredMailboxDrawable; - } else if (mailboxId == Mailbox.QUERY_ALL_DRAFTS) { - return mSpecialMailboxDrawable.getDrawable(Mailbox.TYPE_DRAFTS); - } else if (mailboxId == Mailbox.QUERY_ALL_OUTBOX) { - return mSpecialMailboxDrawable.getDrawable(Mailbox.TYPE_OUTBOX); - } - if (0 <= type && type < mSpecialMailboxDrawable.length()) { - final int resId = mSpecialMailboxDrawable.getResourceId(type, -1); - if (resId != -1) { - return mContext.getResources().getDrawable(resId); - } - } - return null; // No icon - } -} - diff --git a/email2/src/com/android/email/activity/setup/MailboxSettings.java b/email2/src/com/android/email/activity/setup/MailboxSettings.java index a4eb14140..109cfd486 100644 --- a/email2/src/com/android/email/activity/setup/MailboxSettings.java +++ b/email2/src/com/android/email/activity/setup/MailboxSettings.java @@ -32,15 +32,14 @@ import android.preference.PreferenceActivity; import android.util.Log; import android.view.MenuItem; -import com.android.email.FolderProperties; import com.android.email.R; import com.android.email2.ui.MailActivityEmail; import com.android.emailcommon.Logging; import com.android.emailcommon.provider.Account; -import com.android.emailcommon.provider.Policy; import com.android.emailcommon.provider.EmailContent.AccountColumns; import com.android.emailcommon.provider.EmailContent.MailboxColumns; import com.android.emailcommon.provider.Mailbox; +import com.android.emailcommon.provider.Policy; import com.android.emailcommon.utility.EmailAsyncTask; import com.google.common.base.Objects; import com.google.common.base.Preconditions; @@ -224,7 +223,7 @@ public class MailboxSettings extends PreferenceActivity { // Update the title with the mailbox name. ActionBar actionBar = getActionBar(); - String mailboxName = FolderProperties.getInstance(this).getDisplayName(mMailbox); + String mailboxName = "TODO: Get mailbox name"; if (actionBar != null) { actionBar.setTitle(mailboxName); actionBar.setSubtitle(getString(R.string.mailbox_settings_activity_title));