Merge "Make "security required" notification ongoing"
diff --git a/res/drawable-hdpi/btn_check_off_normal_holo_light.png b/res/drawable-hdpi/btn_check_off_normal_holo_light.png
index d59326e..dce5e73 100644
--- a/res/drawable-hdpi/btn_check_off_normal_holo_light.png
+++ b/res/drawable-hdpi/btn_check_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_check_on_normal_holo_light.png b/res/drawable-hdpi/btn_check_on_normal_holo_light.png
index d1e2f3a..26726f6 100644
--- a/res/drawable-hdpi/btn_check_on_normal_holo_light.png
+++ b/res/drawable-hdpi/btn_check_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_focused_holo_light.png b/res/drawable-hdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 0000000..3f01154
--- /dev/null
+++ b/res/drawable-hdpi/btn_star_off_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_normal_holo_light.png b/res/drawable-hdpi/btn_star_off_normal_holo_light.png
new file mode 100644
index 0000000..47598b4
--- /dev/null
+++ b/res/drawable-hdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_pressed_holo_light.png b/res/drawable-hdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 0000000..0a78b6c
--- /dev/null
+++ b/res/drawable-hdpi/btn_star_off_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_focused_holo_light.png b/res/drawable-hdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 0000000..854b126
--- /dev/null
+++ b/res/drawable-hdpi/btn_star_on_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_holo_light.png b/res/drawable-hdpi/btn_star_on_normal_holo_light.png
new file mode 100644
index 0000000..34d8ea1
--- /dev/null
+++ b/res/drawable-hdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_pressed_holo_light.png b/res/drawable-hdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 0000000..0a78b6c
--- /dev/null
+++ b/res/drawable-hdpi/btn_star_on_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/forward.png b/res/drawable-hdpi/forward.png
deleted file mode 100644
index 869ae55..0000000
--- a/res/drawable-hdpi/forward.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_forward.png b/res/drawable-hdpi/ic_forward.png
deleted file mode 100644
index b9ebfc1..0000000
--- a/res/drawable-hdpi/ic_forward.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_forward_holo_dark.png b/res/drawable-hdpi/ic_forward_holo_dark.png
new file mode 100644
index 0000000..31a5c8d
--- /dev/null
+++ b/res/drawable-hdpi/ic_forward_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_reply.png b/res/drawable-hdpi/ic_reply.png
deleted file mode 100644
index 354c5c2..0000000
--- a/res/drawable-hdpi/ic_reply.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_reply_all.png b/res/drawable-hdpi/ic_reply_all.png
deleted file mode 100644
index ec7347a..0000000
--- a/res/drawable-hdpi/ic_reply_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_reply_all_holo_dark.png b/res/drawable-hdpi/ic_reply_all_holo_dark.png
new file mode 100644
index 0000000..e2130a3
--- /dev/null
+++ b/res/drawable-hdpi/ic_reply_all_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_reply_holo_dark.png b/res/drawable-hdpi/ic_reply_holo_dark.png
new file mode 100644
index 0000000..1f5dd61
--- /dev/null
+++ b/res/drawable-hdpi/ic_reply_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/list_activated_holo.9.png b/res/drawable-hdpi/list_activated_holo.9.png
index 12a379b..7b89319 100644
--- a/res/drawable-hdpi/list_activated_holo.9.png
+++ b/res/drawable-hdpi/list_activated_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_focused_holo.9.png b/res/drawable-hdpi/list_focused_holo.9.png
new file mode 100644
index 0000000..e962ce8
--- /dev/null
+++ b/res/drawable-hdpi/list_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_message_focused_holo.9.png b/res/drawable-hdpi/list_message_focused_holo.9.png
deleted file mode 100644
index 8121eaa..0000000
--- a/res/drawable-hdpi/list_message_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_message_pressed_holo.9.png b/res/drawable-hdpi/list_message_pressed_holo.9.png
deleted file mode 100644
index 62e9732..0000000
--- a/res/drawable-hdpi/list_message_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_message_read_holo.9.png b/res/drawable-hdpi/list_message_read_holo.9.png
deleted file mode 100644
index cbe63aa..0000000
--- a/res/drawable-hdpi/list_message_read_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_message_unread_holo.9.png b/res/drawable-hdpi/list_message_unread_holo.9.png
deleted file mode 100644
index 62e1ac0..0000000
--- a/res/drawable-hdpi/list_message_unread_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_message_wide_read_normal_holo.9.png b/res/drawable-hdpi/list_message_wide_read_normal_holo.9.png
deleted file mode 100644
index 834ca09..0000000
--- a/res/drawable-hdpi/list_message_wide_read_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_message_wide_unread_normal_holo.9.png b/res/drawable-hdpi/list_message_wide_unread_normal_holo.9.png
deleted file mode 100644
index 75073e7..0000000
--- a/res/drawable-hdpi/list_message_wide_unread_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_message_wide_unread_pressed_holo.9.png b/res/drawable-hdpi/list_message_wide_unread_pressed_holo.9.png
deleted file mode 100644
index 15e4523..0000000
--- a/res/drawable-hdpi/list_message_wide_unread_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_pressed_holo.9.png b/res/drawable-hdpi/list_pressed_holo.9.png
new file mode 100644
index 0000000..dd183c0
--- /dev/null
+++ b/res/drawable-hdpi/list_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_read_holo.9.png b/res/drawable-hdpi/list_read_holo.9.png
new file mode 100644
index 0000000..e44a18e
--- /dev/null
+++ b/res/drawable-hdpi/list_read_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_unread_holo.9.png b/res/drawable-hdpi/list_unread_holo.9.png
new file mode 100644
index 0000000..5c048b2
--- /dev/null
+++ b/res/drawable-hdpi/list_unread_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_wide_read_normal_holo.9.png b/res/drawable-hdpi/list_wide_read_normal_holo.9.png
new file mode 100644
index 0000000..5ee766a
--- /dev/null
+++ b/res/drawable-hdpi/list_wide_read_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_wide_read_pressed_holo.9.png b/res/drawable-hdpi/list_wide_read_pressed_holo.9.png
new file mode 100644
index 0000000..61a1d6f
--- /dev/null
+++ b/res/drawable-hdpi/list_wide_read_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_conversation_wide_read_selected_holo.9.png b/res/drawable-hdpi/list_wide_read_selected_holo.9.png
similarity index 100%
rename from res/drawable-hdpi/list_conversation_wide_read_selected_holo.9.png
rename to res/drawable-hdpi/list_wide_read_selected_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_wide_unread_normal_holo.9.png b/res/drawable-hdpi/list_wide_unread_normal_holo.9.png
new file mode 100644
index 0000000..c184876
--- /dev/null
+++ b/res/drawable-hdpi/list_wide_unread_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_wide_unread_pressed_holo.9.png b/res/drawable-hdpi/list_wide_unread_pressed_holo.9.png
new file mode 100644
index 0000000..d6bf649
--- /dev/null
+++ b/res/drawable-hdpi/list_wide_unread_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/list_conversation_wide_unread_selected_holo.9.png b/res/drawable-hdpi/list_wide_unread_selected_holo.9.png
similarity index 100%
rename from res/drawable-hdpi/list_conversation_wide_unread_selected_holo.9.png
rename to res/drawable-hdpi/list_wide_unread_selected_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/message_list_activated_holo.9.png b/res/drawable-hdpi/message_list_activated_holo.9.png
deleted file mode 100644
index 34fa61c..0000000
--- a/res/drawable-hdpi/message_list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/reply.png b/res/drawable-hdpi/reply.png
deleted file mode 100644
index 7381610..0000000
--- a/res/drawable-hdpi/reply.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/reply_all.png b/res/drawable-hdpi/reply_all.png
deleted file mode 100644
index 3d81a3c..0000000
--- a/res/drawable-hdpi/reply_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_check_off_normal_holo_light.png b/res/drawable-mdpi/btn_check_off_normal_holo_light.png
index 50bf00f..2a91757 100644
--- a/res/drawable-mdpi/btn_check_off_normal_holo_light.png
+++ b/res/drawable-mdpi/btn_check_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_check_on_normal_holo_light.png b/res/drawable-mdpi/btn_check_on_normal_holo_light.png
index 11b1ef4..adcd47c 100644
--- a/res/drawable-mdpi/btn_check_on_normal_holo_light.png
+++ b/res/drawable-mdpi/btn_check_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_focused_holo_light.png b/res/drawable-mdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 0000000..4e17ab6
--- /dev/null
+++ b/res/drawable-mdpi/btn_star_off_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_holo_light.png b/res/drawable-mdpi/btn_star_off_normal_holo_light.png
new file mode 100644
index 0000000..d4d39b9
--- /dev/null
+++ b/res/drawable-mdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_pressed_holo_light.png b/res/drawable-mdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 0000000..eb4384c
--- /dev/null
+++ b/res/drawable-mdpi/btn_star_off_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_focused_holo_light.png b/res/drawable-mdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 0000000..ba6cef6
--- /dev/null
+++ b/res/drawable-mdpi/btn_star_on_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_holo_light.png b/res/drawable-mdpi/btn_star_on_normal_holo_light.png
new file mode 100644
index 0000000..60360c0
--- /dev/null
+++ b/res/drawable-mdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_pressed_holo_light.png b/res/drawable-mdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 0000000..eb4384c
--- /dev/null
+++ b/res/drawable-mdpi/btn_star_on_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/forward.png b/res/drawable-mdpi/forward.png
deleted file mode 100644
index ffdf139..0000000
--- a/res/drawable-mdpi/forward.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_forward.png b/res/drawable-mdpi/ic_forward.png
deleted file mode 100644
index ba252fd..0000000
--- a/res/drawable-mdpi/ic_forward.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_forward_holo_dark.png b/res/drawable-mdpi/ic_forward_holo_dark.png
new file mode 100644
index 0000000..9bdd226
--- /dev/null
+++ b/res/drawable-mdpi/ic_forward_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_reply.png b/res/drawable-mdpi/ic_reply.png
deleted file mode 100644
index e10eb0e..0000000
--- a/res/drawable-mdpi/ic_reply.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_reply_all.png b/res/drawable-mdpi/ic_reply_all.png
deleted file mode 100644
index 48d1f62..0000000
--- a/res/drawable-mdpi/ic_reply_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_reply_all_holo_dark.png b/res/drawable-mdpi/ic_reply_all_holo_dark.png
new file mode 100644
index 0000000..bdeaf56
--- /dev/null
+++ b/res/drawable-mdpi/ic_reply_all_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_reply_holo_dark.png b/res/drawable-mdpi/ic_reply_holo_dark.png
new file mode 100644
index 0000000..d234bb2
--- /dev/null
+++ b/res/drawable-mdpi/ic_reply_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/list_activated_holo.9.png b/res/drawable-mdpi/list_activated_holo.9.png
index f162c9a..4d98919 100644
--- a/res/drawable-mdpi/list_activated_holo.9.png
+++ b/res/drawable-mdpi/list_activated_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_focused_holo.9.png b/res/drawable-mdpi/list_focused_holo.9.png
new file mode 100644
index 0000000..6e041f3
--- /dev/null
+++ b/res/drawable-mdpi/list_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_message_focused_holo.9.png b/res/drawable-mdpi/list_message_focused_holo.9.png
deleted file mode 100644
index ed10678..0000000
--- a/res/drawable-mdpi/list_message_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_message_pressed_holo.9.png b/res/drawable-mdpi/list_message_pressed_holo.9.png
deleted file mode 100644
index 5942188..0000000
--- a/res/drawable-mdpi/list_message_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_message_read_holo.9.png b/res/drawable-mdpi/list_message_read_holo.9.png
deleted file mode 100644
index e455c54..0000000
--- a/res/drawable-mdpi/list_message_read_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_message_unread_holo.9.png b/res/drawable-mdpi/list_message_unread_holo.9.png
deleted file mode 100644
index d7f4839..0000000
--- a/res/drawable-mdpi/list_message_unread_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_message_wide_read_normal_holo.9.png b/res/drawable-mdpi/list_message_wide_read_normal_holo.9.png
deleted file mode 100644
index 511bfd2..0000000
--- a/res/drawable-mdpi/list_message_wide_read_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_message_wide_unread_normal_holo.9.png b/res/drawable-mdpi/list_message_wide_unread_normal_holo.9.png
deleted file mode 100644
index ac01772..0000000
--- a/res/drawable-mdpi/list_message_wide_unread_normal_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_message_wide_unread_pressed_holo.9.png b/res/drawable-mdpi/list_message_wide_unread_pressed_holo.9.png
deleted file mode 100644
index c4f6c0a..0000000
--- a/res/drawable-mdpi/list_message_wide_unread_pressed_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_pressed_holo.9.png b/res/drawable-mdpi/list_pressed_holo.9.png
new file mode 100644
index 0000000..9358dd8
--- /dev/null
+++ b/res/drawable-mdpi/list_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_read_holo.9.png b/res/drawable-mdpi/list_read_holo.9.png
new file mode 100644
index 0000000..b174964
--- /dev/null
+++ b/res/drawable-mdpi/list_read_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_unread_holo.9.png b/res/drawable-mdpi/list_unread_holo.9.png
new file mode 100644
index 0000000..27af633
--- /dev/null
+++ b/res/drawable-mdpi/list_unread_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_wide_read_normal_holo.9.png b/res/drawable-mdpi/list_wide_read_normal_holo.9.png
new file mode 100644
index 0000000..83ba74d
--- /dev/null
+++ b/res/drawable-mdpi/list_wide_read_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_wide_read_pressed_holo.9.png b/res/drawable-mdpi/list_wide_read_pressed_holo.9.png
new file mode 100644
index 0000000..337ac10
--- /dev/null
+++ b/res/drawable-mdpi/list_wide_read_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_conversation_wide_read_selected_holo.9.png b/res/drawable-mdpi/list_wide_read_selected_holo.9.png
similarity index 100%
rename from res/drawable-mdpi/list_conversation_wide_read_selected_holo.9.png
rename to res/drawable-mdpi/list_wide_read_selected_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_wide_unread_normal_holo.9.png b/res/drawable-mdpi/list_wide_unread_normal_holo.9.png
new file mode 100644
index 0000000..4b6f1b9
--- /dev/null
+++ b/res/drawable-mdpi/list_wide_unread_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_wide_unread_pressed_holo.9.png b/res/drawable-mdpi/list_wide_unread_pressed_holo.9.png
new file mode 100644
index 0000000..596e2ba
--- /dev/null
+++ b/res/drawable-mdpi/list_wide_unread_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/list_conversation_wide_unread_selected_holo.9.png b/res/drawable-mdpi/list_wide_unread_selected_holo.9.png
similarity index 100%
rename from res/drawable-mdpi/list_conversation_wide_unread_selected_holo.9.png
rename to res/drawable-mdpi/list_wide_unread_selected_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/message_list_activated_holo.9.png b/res/drawable-mdpi/message_list_activated_holo.9.png
deleted file mode 100644
index f2acd90..0000000
--- a/res/drawable-mdpi/message_list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/reply.png b/res/drawable-mdpi/reply.png
deleted file mode 100644
index 0f33a86..0000000
--- a/res/drawable-mdpi/reply.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/reply_all.png b/res/drawable-mdpi/reply_all.png
deleted file mode 100644
index a6dfa3e..0000000
--- a/res/drawable-mdpi/reply_all.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png b/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 0000000..d59326e
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/btn_check_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png b/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 0000000..d1e2f3a
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/btn_check_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_off_focused_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 0000000..7b214bc
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/btn_star_off_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_off_normal_holo_light.png
similarity index 100%
rename from res/drawable-hdpi/btn_star_off_normal_email_holo_light.png
rename to res/drawable-sw600dp-hdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_off_pressed_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 0000000..df09465
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/btn_star_off_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_on_focused_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 0000000..6b0db08
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/btn_star_on_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_on_normal_holo_light.png
similarity index 100%
rename from res/drawable-hdpi/btn_star_on_normal_email_holo_light.png
rename to res/drawable-sw600dp-hdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/btn_star_on_pressed_holo_light.png b/res/drawable-sw600dp-hdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 0000000..8e33b30
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/btn_star_on_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png b/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 0000000..50bf00f
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/btn_check_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png b/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 0000000..11b1ef4
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/btn_check_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_off_focused_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 0000000..55d906d
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/btn_star_off_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_off_normal_holo_light.png
similarity index 100%
rename from res/drawable-mdpi/btn_star_off_normal_email_holo_light.png
rename to res/drawable-sw600dp-mdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_off_pressed_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 0000000..4f7324a
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/btn_star_off_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_on_focused_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 0000000..f3cdbc9
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/btn_star_on_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_on_normal_holo_light.png
similarity index 100%
rename from res/drawable-mdpi/btn_star_on_normal_email_holo_light.png
rename to res/drawable-sw600dp-mdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/btn_star_on_pressed_holo_light.png b/res/drawable-sw600dp-mdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 0000000..2001f9e
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/btn_star_on_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 0000000..933e06b
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/btn_check_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 0000000..88d077b
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/btn_check_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_off_focused_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 0000000..1f02ca9
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/btn_star_off_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_off_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_off_normal_holo_light.png
new file mode 100644
index 0000000..30b8af3
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_off_pressed_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 0000000..a2772dd
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/btn_star_off_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_on_focused_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 0000000..65c9ff0
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/btn_star_on_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_on_normal_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_on_normal_holo_light.png
new file mode 100644
index 0000000..8b5bee9
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/btn_star_on_pressed_holo_light.png b/res/drawable-sw600dp-xhdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 0000000..38e5d27
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/btn_star_on_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_check_off_normal_holo_light.png b/res/drawable-xhdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 0000000..cb25218
--- /dev/null
+++ b/res/drawable-xhdpi/btn_check_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_check_on_normal_holo_light.png b/res/drawable-xhdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 0000000..516c602
--- /dev/null
+++ b/res/drawable-xhdpi/btn_check_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_focused_holo_light.png b/res/drawable-xhdpi/btn_star_off_focused_holo_light.png
new file mode 100644
index 0000000..5701ed7
--- /dev/null
+++ b/res/drawable-xhdpi/btn_star_off_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_normal_holo_light.png b/res/drawable-xhdpi/btn_star_off_normal_holo_light.png
new file mode 100644
index 0000000..c541728
--- /dev/null
+++ b/res/drawable-xhdpi/btn_star_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_pressed_holo_light.png b/res/drawable-xhdpi/btn_star_off_pressed_holo_light.png
new file mode 100644
index 0000000..4e4697a
--- /dev/null
+++ b/res/drawable-xhdpi/btn_star_off_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_focused_holo_light.png b/res/drawable-xhdpi/btn_star_on_focused_holo_light.png
new file mode 100644
index 0000000..c9cd021
--- /dev/null
+++ b/res/drawable-xhdpi/btn_star_on_focused_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_normal_holo_light.png b/res/drawable-xhdpi/btn_star_on_normal_holo_light.png
new file mode 100644
index 0000000..7fb0871
--- /dev/null
+++ b/res/drawable-xhdpi/btn_star_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png b/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png
new file mode 100644
index 0000000..4e4697a
--- /dev/null
+++ b/res/drawable-xhdpi/btn_star_on_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_forward_holo_dark.png b/res/drawable-xhdpi/ic_forward_holo_dark.png
new file mode 100644
index 0000000..33d4b34
--- /dev/null
+++ b/res/drawable-xhdpi/ic_forward_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_reply_all_holo_dark.png b/res/drawable-xhdpi/ic_reply_all_holo_dark.png
new file mode 100644
index 0000000..33f81d8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_reply_all_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_reply_holo_dark.png b/res/drawable-xhdpi/ic_reply_holo_dark.png
new file mode 100644
index 0000000..3ca85b5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_reply_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_activated_holo.9.png b/res/drawable-xhdpi/list_activated_holo.9.png
new file mode 100644
index 0000000..4e13add
--- /dev/null
+++ b/res/drawable-xhdpi/list_activated_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_arrow_selected_holo.9.png b/res/drawable-xhdpi/list_arrow_selected_holo.9.png
new file mode 100644
index 0000000..a630af5
--- /dev/null
+++ b/res/drawable-xhdpi/list_arrow_selected_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_focused_holo.9.png b/res/drawable-xhdpi/list_focused_holo.9.png
new file mode 100644
index 0000000..9c90c2b
--- /dev/null
+++ b/res/drawable-xhdpi/list_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_pressed_holo.9.png b/res/drawable-xhdpi/list_pressed_holo.9.png
new file mode 100644
index 0000000..d0fc7e0
--- /dev/null
+++ b/res/drawable-xhdpi/list_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_read_holo.9.png b/res/drawable-xhdpi/list_read_holo.9.png
new file mode 100644
index 0000000..bad2918
--- /dev/null
+++ b/res/drawable-xhdpi/list_read_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_selected_holo.9.png b/res/drawable-xhdpi/list_selected_holo.9.png
new file mode 100644
index 0000000..a3008b0
--- /dev/null
+++ b/res/drawable-xhdpi/list_selected_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_unread_holo.9.png b/res/drawable-xhdpi/list_unread_holo.9.png
new file mode 100644
index 0000000..d32c4c3
--- /dev/null
+++ b/res/drawable-xhdpi/list_unread_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_wide_read_normal_holo.9.png b/res/drawable-xhdpi/list_wide_read_normal_holo.9.png
new file mode 100644
index 0000000..26e32f0
--- /dev/null
+++ b/res/drawable-xhdpi/list_wide_read_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_wide_read_pressed_holo.9.png b/res/drawable-xhdpi/list_wide_read_pressed_holo.9.png
new file mode 100644
index 0000000..366f945
--- /dev/null
+++ b/res/drawable-xhdpi/list_wide_read_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_wide_read_selected_holo.9.png b/res/drawable-xhdpi/list_wide_read_selected_holo.9.png
new file mode 100644
index 0000000..2803bf0
--- /dev/null
+++ b/res/drawable-xhdpi/list_wide_read_selected_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_wide_unread_normal_holo.9.png b/res/drawable-xhdpi/list_wide_unread_normal_holo.9.png
new file mode 100644
index 0000000..05c6130
--- /dev/null
+++ b/res/drawable-xhdpi/list_wide_unread_normal_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_wide_unread_pressed_holo.9.png b/res/drawable-xhdpi/list_wide_unread_pressed_holo.9.png
new file mode 100644
index 0000000..d4cfa2f
--- /dev/null
+++ b/res/drawable-xhdpi/list_wide_unread_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/list_wide_unread_selected_holo.9.png b/res/drawable-xhdpi/list_wide_unread_selected_holo.9.png
new file mode 100644
index 0000000..caac304
--- /dev/null
+++ b/res/drawable-xhdpi/list_wide_unread_selected_holo.9.png
Binary files differ
diff --git a/res/drawable/message_list_item_background_read.xml b/res/drawable/message_list_item_background_read.xml
deleted file mode 100644
index c973783..0000000
--- a/res/drawable/message_list_item_background_read.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_window_focused="false" android:state_selected="true"
- android:drawable="@android:color/transparent" />
- <item android:state_selected="true"
- android:drawable="@android:color/transparent" />
- <item android:state_pressed="true" android:state_selected="false"
- android:drawable="@android:color/transparent" />
- <item android:state_selected="false"
- android:drawable="@color/message_list_item_background_read" />
-</selector>
diff --git a/res/drawable/message_list_item_background_unread.xml b/res/drawable/message_list_item_background_unread.xml
deleted file mode 100644
index cdba2bc..0000000
--- a/res/drawable/message_list_item_background_unread.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_window_focused="false" android:state_selected="true"
- android:drawable="@android:color/transparent" />
- <item android:state_selected="true"
- android:drawable="@android:color/transparent" />
- <item android:state_pressed="true" android:state_selected="false"
- android:drawable="@android:color/transparent" />
- <item android:state_selected="false"
- android:drawable="@color/message_list_item_background_unread" />
-</selector>
diff --git a/res/drawable/message_list_read_selector.xml b/res/drawable/message_list_read_selector.xml
index 72ea231..b57f802 100644
--- a/res/drawable/message_list_read_selector.xml
+++ b/res/drawable/message_list_read_selector.xml
@@ -16,13 +16,15 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"
- android:drawable="@drawable/list_message_focused_holo" />
+ android:drawable="@drawable/list_focused_holo" />
+ <item android:state_pressed="true"
+ android:drawable="@drawable/list_pressed_holo" />
<item android:state_selected="true"
android:state_activated="true"
android:drawable="@drawable/list_arrow_selected_holo" />
<item android:state_activated="true"
- android:drawable="@drawable/message_list_activated_holo" />
+ android:drawable="@drawable/list_activated_holo" />
<item android:state_selected="true"
android:drawable="@drawable/list_selected_holo" />
- <item android:drawable="@drawable/list_message_read_holo" />
+ <item android:drawable="@drawable/list_read_holo" />
</selector>
diff --git a/res/drawable/message_list_unread_selector.xml b/res/drawable/message_list_unread_selector.xml
index 3c043ec..206a1db 100644
--- a/res/drawable/message_list_unread_selector.xml
+++ b/res/drawable/message_list_unread_selector.xml
@@ -16,15 +16,15 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true"
- android:drawable="@drawable/list_message_focused_holo" />
+ android:drawable="@drawable/list_focused_holo" />
<item android:state_pressed="true"
- android:drawable="@drawable/list_message_pressed_holo" />
+ android:drawable="@drawable/list_pressed_holo" />
<item android:state_selected="true"
android:state_activated="true"
android:drawable="@drawable/list_arrow_selected_holo" />
<item android:state_activated="true"
- android:drawable="@drawable/message_list_activated_holo" />
+ android:drawable="@drawable/list_activated_holo" />
<item android:state_selected="true"
android:drawable="@drawable/list_selected_holo" />
- <item android:drawable="@drawable/list_message_unread_holo" />
+ <item android:drawable="@drawable/list_unread_holo" />
</selector>
diff --git a/res/drawable/message_list_wide_read_selector.xml b/res/drawable/message_list_wide_read_selector.xml
index 68eb8ad..c523a09 100644
--- a/res/drawable/message_list_wide_read_selector.xml
+++ b/res/drawable/message_list_wide_read_selector.xml
@@ -15,7 +15,9 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true"
+ android:drawable="@drawable/list_wide_read_pressed_holo" />
<item android:state_selected="true"
- android:drawable="@drawable/list_conversation_wide_read_selected_holo" />
- <item android:drawable="@drawable/list_message_wide_read_normal_holo" />
+ android:drawable="@drawable/list_wide_read_selected_holo" />
+ <item android:drawable="@drawable/list_wide_read_normal_holo" />
</selector>
diff --git a/res/drawable/message_list_wide_unread_selector.xml b/res/drawable/message_list_wide_unread_selector.xml
index f92c5f1..5d817fd 100644
--- a/res/drawable/message_list_wide_unread_selector.xml
+++ b/res/drawable/message_list_wide_unread_selector.xml
@@ -16,8 +16,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@drawable/list_message_wide_unread_pressed_holo" />
+ android:drawable="@drawable/list_wide_unread_pressed_holo" />
<item android:state_selected="true"
- android:drawable="@drawable/list_conversation_wide_unread_selected_holo" />
- <item android:drawable="@drawable/list_message_wide_unread_normal_holo" />
+ android:drawable="@drawable/list_wide_unread_selected_holo" />
+ <item android:drawable="@drawable/list_wide_unread_normal_holo" />
</selector>
diff --git a/res/layout-land/message_view_header_actions.xml b/res/layout-land/message_view_header_actions.xml
index df668e7..df098f8 100644
--- a/res/layout-land/message_view_header_actions.xml
+++ b/res/layout-land/message_view_header_actions.xml
@@ -17,14 +17,14 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView
android:id="@+id/favorite"
- android:src="@drawable/btn_star_off_normal_email_holo_light"
+ android:src="@drawable/btn_star_off_normal_holo_light"
android:layout_width="32dip"
android:layout_height="24dip"
android:layout_margin="8dip"
/>
<ImageView
android:id="@+id/reply"
- android:src="@drawable/reply"
+ android:src="@drawable/ic_reply_holo_dark"
android:layout_width="32dip"
android:layout_height="24dip"
android:layout_margin="8dip"
@@ -32,7 +32,7 @@
/>
<ImageView
android:id="@+id/reply_all"
- android:src="@drawable/reply_all"
+ android:src="@drawable/ic_reply_all_holo_dark"
android:layout_width="32dip"
android:layout_height="24dip"
android:layout_margin="8dip"
@@ -40,7 +40,7 @@
/>
<ImageView
android:id="@+id/forward"
- android:src="@drawable/forward"
+ android:src="@drawable/ic_forward_holo_dark"
android:layout_width="32dip"
android:layout_height="24dip"
android:layout_margin="8dip"
diff --git a/res/layout-sw600dp/message_list_item_narrow.xml b/res/layout-sw600dp/message_list_item_narrow.xml
index 1707b78..a33f7b2 100644
--- a/res/layout-sw600dp/message_list_item_narrow.xml
+++ b/res/layout-sw600dp/message_list_item_narrow.xml
@@ -40,7 +40,7 @@
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
</LinearLayout>
<LinearLayout
android:layout_width="0dip"
@@ -97,6 +97,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout-sw600dp/message_list_item_normal.xml b/res/layout-sw600dp/message_list_item_normal.xml
index e1fb3d6..41c7e9c 100644
--- a/res/layout-sw600dp/message_list_item_normal.xml
+++ b/res/layout-sw600dp/message_list_item_normal.xml
@@ -41,7 +41,7 @@
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
</LinearLayout>
<LinearLayout
android:layout_width="0dip"
@@ -99,6 +99,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dip"
android:layout_marginRight="8dip"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout-sw600dp/message_list_item_wide.xml b/res/layout-sw600dp/message_list_item_wide.xml
index 7ecbf1f..226d670 100644
--- a/res/layout-sw600dp/message_list_item_wide.xml
+++ b/res/layout-sw600dp/message_list_item_wide.xml
@@ -49,7 +49,7 @@
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
<TextView
android:id="@+id/subject"
android:layout_width="0dip"
@@ -96,5 +96,5 @@
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
</LinearLayout>
diff --git a/res/layout-sw600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml
index 0af6f71..a634c76 100644
--- a/res/layout-sw600dp/message_view_fragment.xml
+++ b/res/layout-sw600dp/message_view_fragment.xml
@@ -96,7 +96,7 @@
android:id="@+id/reply"
android:layout_marginRight="16dip"
android:contentDescription="@string/reply_action"
- android:src="@drawable/ic_reply"
+ android:src="@drawable/ic_reply_holo_dark"
android:visibility="gone"
style="@style/message_view_action_buttons"
/>
@@ -104,7 +104,7 @@
android:id="@+id/reply_all"
android:layout_marginRight="16dip"
android:contentDescription="@string/reply_all_action"
- android:src="@drawable/ic_reply_all"
+ android:src="@drawable/ic_reply_all_holo_dark"
android:visibility="gone"
style="@style/message_view_action_buttons"
/>
@@ -112,14 +112,14 @@
android:id="@+id/forward"
android:layout_marginRight="16dip"
android:contentDescription="@string/forward_action"
- android:src="@drawable/ic_forward"
+ android:src="@drawable/ic_forward_holo_dark"
android:visibility="gone"
style="@style/message_view_action_buttons"
/>
<ImageButton
android:id="@+id/favorite"
android:layout_marginRight="16dip"
- android:src="@drawable/btn_star_off_normal_email_holo_light"
+ android:src="@drawable/btn_star_off_normal_holo_light"
style="@style/message_view_action_buttons"
/>
</LinearLayout>
diff --git a/res/layout-v14/address_text_view.xml b/res/layout-v14/address_text_view.xml
index ca91824..f261455 100644
--- a/res/layout-v14/address_text_view.xml
+++ b/res/layout-v14/address_text_view.xml
@@ -16,8 +16,4 @@
<com.android.email.activity.ChipsAddressTextView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?android:attr/textColorSecondary"
- android:inputType="textEmailAddress|textMultiLine"
- android:imeOptions="actionNext"
- android:layout_weight="1" />
\ No newline at end of file
+ style="@style/EmailRecipientEditTextView" />
\ No newline at end of file
diff --git a/res/layout/message_list_item_narrow.xml b/res/layout/message_list_item_narrow.xml
index f01bf42..08a264e 100644
--- a/res/layout/message_list_item_narrow.xml
+++ b/res/layout/message_list_item_narrow.xml
@@ -40,7 +40,7 @@
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
</LinearLayout>
<LinearLayout
android:layout_width="0dip"
@@ -96,6 +96,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/message_list_item_normal.xml b/res/layout/message_list_item_normal.xml
index f01bf42..08a264e 100644
--- a/res/layout/message_list_item_normal.xml
+++ b/res/layout/message_list_item_normal.xml
@@ -40,7 +40,7 @@
android:id="@+id/reply_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
</LinearLayout>
<LinearLayout
android:layout_width="0dip"
@@ -96,6 +96,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/message_list_item_wide.xml b/res/layout/message_list_item_wide.xml
index 7ecbf1f..226d670 100644
--- a/res/layout/message_list_item_wide.xml
+++ b/res/layout/message_list_item_wide.xml
@@ -49,7 +49,7 @@
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
- android:src="@drawable/reply" />
+ android:src="@drawable/ic_reply_holo_dark" />
<TextView
android:id="@+id/subject"
android:layout_width="0dip"
@@ -96,5 +96,5 @@
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:layout_gravity="center_vertical"
- android:src="@drawable/btn_star_off_normal_email_holo_light" />
+ android:src="@drawable/btn_star_off_normal_holo_light" />
</LinearLayout>
diff --git a/res/layout/message_view_header_actions.xml b/res/layout/message_view_header_actions.xml
index 6ff4bdc..537e82f 100644
--- a/res/layout/message_view_header_actions.xml
+++ b/res/layout/message_view_header_actions.xml
@@ -17,14 +17,14 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView
android:id="@+id/favorite"
- android:src="@drawable/btn_star_off_normal_email_holo_light"
+ android:src="@drawable/btn_star_off_normal_holo_light"
android:layout_width="32dip"
android:layout_height="24dip"
android:layout_margin="6dip"
/>
<ImageView
android:id="@+id/reply"
- android:src="@drawable/reply"
+ android:src="@drawable/ic_reply_holo_dark"
android:layout_width="32dip"
android:layout_height="24dip"
android:layout_margin="6dip"
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index db3603e..69bef0b 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -24,6 +24,7 @@
/>
<item
android:id="@+id/add_cc_bcc"
+ android:icon="@drawable/ic_menu_cc_holo_light"
android:title="@string/add_cc_bcc_menu"
/>
<item
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 4e6068c..8e48d80 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -38,4 +38,8 @@
<item name="android:singleLine">true</item>
<item name="android:ellipsize">end</item>
</style>
+
+ <style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
+ <item name="android:minHeight">40dip</item>
+ </style>
</resources>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index f7e094e..344960b 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -21,4 +21,7 @@
<style name="message_compose_scroll">
<item name="android:layout_width">800dip</item>
</style>
+ <style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
+ <item name="android:minHeight">48dip</item>
+ </style>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 073fd4c..7c531f6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -184,5 +184,8 @@
<item name="android:paddingRight">6dip</item>
</style>
+ <style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
+ <item name="android:minHeight">48dip</item>
+ </style>
</resources>
diff --git a/src/com/android/email/activity/MessageListItem.java b/src/com/android/email/activity/MessageListItem.java
index 19c6a33..ba965e0 100644
--- a/src/com/android/email/activity/MessageListItem.java
+++ b/src/com/android/email/activity/MessageListItem.java
@@ -163,9 +163,9 @@
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_off_normal_email_holo_light);
+ BitmapFactory.decodeResource(r, R.drawable.btn_star_off_normal_holo_light);
sFavoriteIconOn =
- BitmapFactory.decodeResource(r, R.drawable.btn_star_on_normal_email_holo_light);
+ BitmapFactory.decodeResource(r, R.drawable.btn_star_on_normal_holo_light);
sSelectedIconOff =
BitmapFactory.decodeResource(r, R.drawable.btn_check_off_normal_holo_light);
sSelectedIconOn =
@@ -173,11 +173,11 @@
//TODO: put the actual drawables when they exist. these are temps for visibile testing.
sStateReplied =
- BitmapFactory.decodeResource(r, R.drawable.reply);
+ BitmapFactory.decodeResource(r, R.drawable.ic_reply_holo_dark);
sStateForwarded =
- BitmapFactory.decodeResource(r, R.drawable.forward);
+ BitmapFactory.decodeResource(r, R.drawable.ic_forward_holo_dark);
sStateRepliedAndForwarded =
- BitmapFactory.decodeResource(r, R.drawable.reply_all);
+ BitmapFactory.decodeResource(r, R.drawable.ic_reply_all_holo_dark);
sInit = true;
}
diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
index 09fdd64..6c01e05 100644
--- a/src/com/android/email/activity/MessageViewFragment.java
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -182,8 +182,8 @@
setHasOptionsMenu(true);
final Resources res = getActivity().getResources();
- mFavoriteIconOn = res.getDrawable(R.drawable.btn_star_on_normal_email_holo_light);
- mFavoriteIconOff = res.getDrawable(R.drawable.btn_star_off_normal_email_holo_light);
+ mFavoriteIconOn = res.getDrawable(R.drawable.btn_star_on_normal_holo_light);
+ mFavoriteIconOff = res.getDrawable(R.drawable.btn_star_off_normal_holo_light);
}
@Override
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 7ac5ca4..0a4b33c 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -1801,7 +1801,8 @@
// Return a cursor with an id projection
MatrixCursor mc = new MatrixCursor(EmailContent.ID_PROJECTION);
mc.addRow(new Object[] {accountId});
- return mc;
+ c = mc;
+ break;
case MAILBOX_ID_FROM_ACCOUNT_AND_TYPE:
// Get accountId and type and find the mailbox in our map
List<String> pathSegments = uri.getPathSegments();
@@ -1811,7 +1812,8 @@
// Return a cursor with an id projection
mc = new MatrixCursor(EmailContent.ID_PROJECTION);
mc.addRow(new Object[] {mailboxId});
- return mc;
+ c = mc;
+ break;
case BODY:
case MESSAGE:
case UPDATED_MESSAGE:
@@ -2439,15 +2441,22 @@
* This entails creating AccountManager accounts for all pop3 and imap accounts
*/
- private static final String[] RECV_PROJECTION =
+ private static final String[] V21_ACCOUNT_PROJECTION =
new String[] {AccountColumns.HOST_AUTH_KEY_RECV};
- private static final int EMAIL_AND_RECV_COLUMN_RECV = 0;
+ private static final int V21_ACCOUNT_RECV = 0;
- static private void createAccountManagerAccount(Context context, HostAuth hostAuth) {
+ private static final String[] V21_HOSTAUTH_PROJECTION =
+ new String[] {HostAuthColumns.PROTOCOL, HostAuthColumns.LOGIN, HostAuthColumns.PASSWORD};
+ private static final int V21_HOSTAUTH_PROTOCOL = 0;
+ private static final int V21_HOSTAUTH_LOGIN = 1;
+ private static final int V21_HOSTAUTH_PASSWORD = 2;
+
+ static private void createAccountManagerAccount(Context context, String login,
+ String password) {
AccountManager accountManager = AccountManager.get(context);
android.accounts.Account amAccount =
- new android.accounts.Account(hostAuth.mLogin, AccountManagerTypes.TYPE_POP_IMAP);
- accountManager.addAccountExplicitly(amAccount, hostAuth.mPassword, null);
+ new android.accounts.Account(login, AccountManagerTypes.TYPE_POP_IMAP);
+ accountManager.addAccountExplicitly(amAccount, password, null);
ContentResolver.setIsSyncable(amAccount, EmailContent.AUTHORITY, 1);
ContentResolver.setSyncAutomatically(amAccount, EmailContent.AUTHORITY, true);
ContentResolver.setIsSyncable(amAccount, ContactsContract.AUTHORITY, 0);
@@ -2458,24 +2467,24 @@
static void upgradeFromVersion21ToVersion22(SQLiteDatabase db, Context accountManagerContext) {
try {
// Loop through accounts, looking for pop/imap accounts
- Cursor accountCursor = db.query(Account.TABLE_NAME, RECV_PROJECTION, null,
+ Cursor accountCursor = db.query(Account.TABLE_NAME, V21_ACCOUNT_PROJECTION, null,
null, null, null, null);
try {
String[] hostAuthArgs = new String[1];
while (accountCursor.moveToNext()) {
- hostAuthArgs[0] = accountCursor.getString(EMAIL_AND_RECV_COLUMN_RECV);
+ hostAuthArgs[0] = accountCursor.getString(V21_ACCOUNT_RECV);
// Get the "receive" HostAuth for this account
Cursor hostAuthCursor = db.query(HostAuth.TABLE_NAME,
- HostAuth.CONTENT_PROJECTION, HostAuth.RECORD_ID + "=?", hostAuthArgs,
+ V21_HOSTAUTH_PROJECTION, HostAuth.RECORD_ID + "=?", hostAuthArgs,
null, null, null);
try {
if (hostAuthCursor.moveToFirst()) {
- HostAuth hostAuth = new HostAuth();
- hostAuth.restore(hostAuthCursor);
- String protocol = hostAuth.mProtocol;
+ String protocol = hostAuthCursor.getString(V21_HOSTAUTH_PROTOCOL);
// If this is a pop3 or imap account, create the account manager account
if ("imap".equals(protocol) || "pop3".equals(protocol)) {
- createAccountManagerAccount(accountManagerContext, hostAuth);
+ createAccountManagerAccount(accountManagerContext,
+ hostAuthCursor.getString(V21_HOSTAUTH_LOGIN),
+ hostAuthCursor.getString(V21_HOSTAUTH_PASSWORD));
}
}
} finally {
@@ -2523,36 +2532,37 @@
}
}
-
- private static final String[] ID_FLAGS_RECV_PROJECTION =
+ private static final String[] V25_ACCOUNT_PROJECTION =
new String[] {AccountColumns.ID, AccountColumns.FLAGS, AccountColumns.HOST_AUTH_KEY_RECV};
- private static final int ID_FLAGS_RECV_COLUMN_ID = 0;
- private static final int ID_FLAGS_RECV_COLUMN_FLAGS = 1;
- private static final int ID_FLAGS_RECV_COLUMN_RECV = 2;
+ private static final int V25_ACCOUNT_ID = 0;
+ private static final int V25_ACCOUNT_FLAGS = 1;
+ private static final int V25_ACCOUNT_RECV = 2;
+
+ private static final String[] V25_HOSTAUTH_PROJECTION = new String[] {HostAuthColumns.PROTOCOL};
+ private static final int V25_HOSTAUTH_PROTOCOL = 0;
/** Upgrades the database from v25 to v26 by adding FLAG_SUPPORTS_SEARCH to IMAP accounts */
private static void upgradeFromVersion25ToVersion26(SQLiteDatabase db) {
try {
// Loop through accounts, looking for imap accounts
- Cursor accountCursor = db.query(Account.TABLE_NAME, ID_FLAGS_RECV_PROJECTION, null,
+ Cursor accountCursor = db.query(Account.TABLE_NAME, V25_ACCOUNT_PROJECTION, null,
null, null, null, null);
ContentValues cv = new ContentValues();
try {
String[] hostAuthArgs = new String[1];
while (accountCursor.moveToNext()) {
- hostAuthArgs[0] = accountCursor.getString(ID_FLAGS_RECV_COLUMN_RECV);
+ hostAuthArgs[0] = accountCursor.getString(V25_ACCOUNT_RECV);
// Get the "receive" HostAuth for this account
Cursor hostAuthCursor = db.query(HostAuth.TABLE_NAME,
- HostAuth.CONTENT_PROJECTION, HostAuth.RECORD_ID + "=?", hostAuthArgs,
+ V25_HOSTAUTH_PROJECTION, HostAuth.RECORD_ID + "=?", hostAuthArgs,
null, null, null);
try {
if (hostAuthCursor.moveToFirst()) {
- HostAuth hostAuth = new HostAuth();
- hostAuth.restore(hostAuthCursor);
+ String protocol = hostAuthCursor.getString(V25_HOSTAUTH_PROTOCOL);
// If this is an imap account, add the search flag
- if (HostAuth.SCHEME_IMAP.equals(hostAuth.mProtocol)) {
- String id = accountCursor.getString(ID_FLAGS_RECV_COLUMN_ID);
- int flags = accountCursor.getInt(ID_FLAGS_RECV_COLUMN_FLAGS);
+ if (HostAuth.SCHEME_IMAP.equals(protocol)) {
+ String id = accountCursor.getString(V25_ACCOUNT_ID);
+ int flags = accountCursor.getInt(V25_ACCOUNT_FLAGS);
cv.put(AccountColumns.FLAGS, flags | Account.FLAGS_SUPPORTS_SEARCH);
db.update(Account.TABLE_NAME, cv, Account.RECORD_ID + "=?",
new String[] {id});
diff --git a/src/com/android/email/service/AttachmentDownloadService.java b/src/com/android/email/service/AttachmentDownloadService.java
index 9a6361e..e8b3c4d 100644
--- a/src/com/android/email/service/AttachmentDownloadService.java
+++ b/src/com/android/email/service/AttachmentDownloadService.java
@@ -427,7 +427,7 @@
}
}
// Check whether we can start new downloads...
- if (mConnectivityManager.hasConnectivity()) {
+ if (mConnectivityManager != null && mConnectivityManager.hasConnectivity()) {
processQueue();
}
}
