Imported new assets
Change-Id: I9bb245c4a8c50625e10655774dc3700c80c224af
diff --git a/res/drawable-hdpi/btn_circle_disable.png b/res/drawable-hdpi/btn_circle_disable.png
deleted file mode 100755
index f04da38..0000000
--- a/res/drawable-hdpi/btn_circle_disable.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_circle_disable_focused.png b/res/drawable-hdpi/btn_circle_disable_focused.png
deleted file mode 100755
index 1c918a5..0000000
--- a/res/drawable-hdpi/btn_circle_disable_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_circle_normal.png b/res/drawable-hdpi/btn_circle_normal.png
deleted file mode 100755
index f5aedb4..0000000
--- a/res/drawable-hdpi/btn_circle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_circle_pressed.png b/res/drawable-hdpi/btn_circle_pressed.png
deleted file mode 100755
index bada362..0000000
--- a/res/drawable-hdpi/btn_circle_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_circle_selected.png b/res/drawable-hdpi/btn_circle_selected.png
deleted file mode 100755
index 1c918a5..0000000
--- a/res/drawable-hdpi/btn_circle_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_minus_disabled_focused_holo_light.png b/res/drawable-hdpi/btn_minus_disabled_focused_holo_light.png
deleted file mode 100644
index 25df91d..0000000
--- a/res/drawable-hdpi/btn_minus_disabled_focused_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_minus_disabled_holo_light.png b/res/drawable-hdpi/btn_minus_disabled_holo_light.png
deleted file mode 100644
index 79b3f18..0000000
--- a/res/drawable-hdpi/btn_minus_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_minus_focused_holo_light.png b/res/drawable-hdpi/btn_minus_focused_holo_light.png
deleted file mode 100644
index c13a698..0000000
--- a/res/drawable-hdpi/btn_minus_focused_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_minus_normal_holo_light.png b/res/drawable-hdpi/btn_minus_normal_holo_light.png
deleted file mode 100644
index 469ba41..0000000
--- a/res/drawable-hdpi/btn_minus_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_minus_pressed_holo_light.png b/res/drawable-hdpi/btn_minus_pressed_holo_light.png
deleted file mode 100644
index 288ded0..0000000
--- a/res/drawable-hdpi/btn_minus_pressed_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_plus_disabled_focused_holo_light.png b/res/drawable-hdpi/btn_plus_disabled_focused_holo_light.png
deleted file mode 100644
index 5d2d0e6..0000000
--- a/res/drawable-hdpi/btn_plus_disabled_focused_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_plus_disabled_holo_light.png b/res/drawable-hdpi/btn_plus_disabled_holo_light.png
deleted file mode 100644
index 4525d29..0000000
--- a/res/drawable-hdpi/btn_plus_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_plus_focused_holo_light.png b/res/drawable-hdpi/btn_plus_focused_holo_light.png
deleted file mode 100644
index 33ad868..0000000
--- a/res/drawable-hdpi/btn_plus_focused_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_plus_normal_holo_light.png b/res/drawable-hdpi/btn_plus_normal_holo_light.png
deleted file mode 100644
index 5239c38..0000000
--- a/res/drawable-hdpi/btn_plus_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_plus_pressed_holo_light.png b/res/drawable-hdpi/btn_plus_pressed_holo_light.png
deleted file mode 100644
index 6a84127..0000000
--- a/res/drawable-hdpi/btn_plus_pressed_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_btn_round_less.png b/res/drawable-hdpi/ic_btn_round_less.png
deleted file mode 100644
index 819440e..0000000
--- a/res/drawable-hdpi/ic_btn_round_less.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_btn_round_more.png b/res/drawable-hdpi/ic_btn_round_more.png
deleted file mode 100755
index 9883d55..0000000
--- a/res/drawable-hdpi/ic_btn_round_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_accounts_holo_light.png b/res/drawable-hdpi/ic_menu_accounts_holo_light.png
new file mode 100644
index 0000000..6874cdc
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_accounts_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_accounts_normal_holo.png b/res/drawable-hdpi/ic_menu_accounts_normal_holo.png
deleted file mode 100644
index 682b0fc..0000000
--- a/res/drawable-hdpi/ic_menu_accounts_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_accounts_pressed_holo.png b/res/drawable-hdpi/ic_menu_accounts_pressed_holo.png
deleted file mode 100644
index 2047a14..0000000
--- a/res/drawable-hdpi/ic_menu_accounts_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_contact_holo_light.png b/res/drawable-hdpi/ic_menu_add_contact_holo_light.png
new file mode 100644
index 0000000..8942855
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_contact_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_contact_normal_holo.png b/res/drawable-hdpi/ic_menu_add_contact_normal_holo.png
deleted file mode 100644
index d548ade..0000000
--- a/res/drawable-hdpi/ic_menu_add_contact_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_contact_pressed_holo.png b/res/drawable-hdpi/ic_menu_add_contact_pressed_holo.png
deleted file mode 100644
index 1c1f737..0000000
--- a/res/drawable-hdpi/ic_menu_add_contact_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_field_normal_holo_light.png b/res/drawable-hdpi/ic_menu_add_field_normal_holo_light.png
new file mode 100644
index 0000000..ee902ca
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_field_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_field_pressed_holo_light.png b/res/drawable-hdpi/ic_menu_add_field_pressed_holo_light.png
new file mode 100644
index 0000000..14d1df4
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_field_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_cancel_holo_light.png b/res/drawable-hdpi/ic_menu_cancel_holo_light.png
new file mode 100644
index 0000000..65c6a19
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_cancel_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_cancel_normal_holo.png b/res/drawable-hdpi/ic_menu_cancel_normal_holo.png
deleted file mode 100644
index 5f68c62..0000000
--- a/res/drawable-hdpi/ic_menu_cancel_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_cancel_pressed_holo.png b/res/drawable-hdpi/ic_menu_cancel_pressed_holo.png
deleted file mode 100644
index 917a19d..0000000
--- a/res/drawable-hdpi/ic_menu_cancel_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_compose_holo_light.png b/res/drawable-hdpi/ic_menu_compose_holo_light.png
new file mode 100644
index 0000000..9a2c60e
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_compose_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_compose_normal_holo.png b/res/drawable-hdpi/ic_menu_compose_normal_holo.png
deleted file mode 100644
index ff8f862..0000000
--- a/res/drawable-hdpi/ic_menu_compose_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_compose_pressed_holo.png b/res/drawable-hdpi/ic_menu_compose_pressed_holo.png
deleted file mode 100644
index c045226..0000000
--- a/res/drawable-hdpi/ic_menu_compose_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_done_holo_light.png b/res/drawable-hdpi/ic_menu_done_holo_light.png
new file mode 100644
index 0000000..fb67927
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_done_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_done_normal_holo.png b/res/drawable-hdpi/ic_menu_done_normal_holo.png
deleted file mode 100644
index 39ad5b9..0000000
--- a/res/drawable-hdpi/ic_menu_done_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_done_pressed_holo.png b/res/drawable-hdpi/ic_menu_done_pressed_holo.png
deleted file mode 100644
index c7e1338..0000000
--- a/res/drawable-hdpi/ic_menu_done_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_expander_maximized_normal_holo_light.png b/res/drawable-hdpi/ic_menu_expander_maximized_normal_holo_light.png
new file mode 100644
index 0000000..abdab63
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_expander_maximized_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_expander_maximized_pressed_holo_light.png b/res/drawable-hdpi/ic_menu_expander_maximized_pressed_holo_light.png
new file mode 100644
index 0000000..bff50ab
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_expander_maximized_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_expander_minimized_normal_holo_light.png b/res/drawable-hdpi/ic_menu_expander_minimized_normal_holo_light.png
new file mode 100644
index 0000000..3ff83fb
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_expander_minimized_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_expander_minimized_pressed_holo_light.png b/res/drawable-hdpi/ic_menu_expander_minimized_pressed_holo_light.png
new file mode 100644
index 0000000..afdb9df
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_expander_minimized_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_import_export_holo_light.png b/res/drawable-hdpi/ic_menu_import_export_holo_light.png
new file mode 100644
index 0000000..048e116
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_import_export_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_import_export_normal_holo.png b/res/drawable-hdpi/ic_menu_import_export_normal_holo.png
deleted file mode 100644
index 2602e5f..0000000
--- a/res/drawable-hdpi/ic_menu_import_export_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_import_export_pressed_holo.png b/res/drawable-hdpi/ic_menu_import_export_pressed_holo.png
deleted file mode 100644
index c4d5e3b..0000000
--- a/res/drawable-hdpi/ic_menu_import_export_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_merge_holo_light.png b/res/drawable-hdpi/ic_menu_merge_holo_light.png
new file mode 100644
index 0000000..a0546c8
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_merge_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_merge_normal_holo.png b/res/drawable-hdpi/ic_menu_merge_normal_holo.png
deleted file mode 100644
index 4e6ff36..0000000
--- a/res/drawable-hdpi/ic_menu_merge_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_merge_pressed_holo.png b/res/drawable-hdpi/ic_menu_merge_pressed_holo.png
deleted file mode 100644
index 583e7ec..0000000
--- a/res/drawable-hdpi/ic_menu_merge_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_remove_field_normal_holo_light.png b/res/drawable-hdpi/ic_menu_remove_field_normal_holo_light.png
new file mode 100644
index 0000000..c8dc663
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_remove_field_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_remove_field_pressed_holo_light.png b/res/drawable-hdpi/ic_menu_remove_field_pressed_holo_light.png
new file mode 100644
index 0000000..7cfdfe9
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_remove_field_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_settings_holo_light.png b/res/drawable-hdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 0000000..1146a1e
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_settings_normal_holo.png b/res/drawable-hdpi/ic_menu_settings_normal_holo.png
deleted file mode 100644
index 30cb132..0000000
--- a/res/drawable-hdpi/ic_menu_settings_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_settings_pressed_holo.png b/res/drawable-hdpi/ic_menu_settings_pressed_holo.png
deleted file mode 100644
index 03ea60b..0000000
--- a/res/drawable-hdpi/ic_menu_settings_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_share_holo_light.png b/res/drawable-hdpi/ic_menu_share_holo_light.png
new file mode 100644
index 0000000..8523dc3
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_share_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_share_normal_holo.png b/res/drawable-hdpi/ic_menu_share_normal_holo.png
deleted file mode 100644
index d18adaf..0000000
--- a/res/drawable-hdpi/ic_menu_share_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_share_pressed_holo.png b/res/drawable-hdpi/ic_menu_share_pressed_holo.png
deleted file mode 100644
index aee9001..0000000
--- a/res/drawable-hdpi/ic_menu_share_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_split_holo_light.png b/res/drawable-hdpi/ic_menu_split_holo_light.png
new file mode 100644
index 0000000..604fcc1
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_split_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_split_normal_holo.png b/res/drawable-hdpi/ic_menu_split_normal_holo.png
deleted file mode 100644
index 29c8c38..0000000
--- a/res/drawable-hdpi/ic_menu_split_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_split_pressed_holo.png b/res/drawable-hdpi/ic_menu_split_pressed_holo.png
deleted file mode 100644
index ad5de95..0000000
--- a/res/drawable-hdpi/ic_menu_split_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_trash_holo_light.png b/res/drawable-hdpi/ic_menu_trash_holo_light.png
new file mode 100644
index 0000000..1bf001e
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_trash_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_trash_normal_holo.png b/res/drawable-hdpi/ic_menu_trash_normal_holo.png
deleted file mode 100644
index 6e601c8..0000000
--- a/res/drawable-hdpi/ic_menu_trash_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_trash_pressed_holo.png b/res/drawable-hdpi/ic_menu_trash_pressed_holo.png
deleted file mode 100644
index 9579c53..0000000
--- a/res/drawable-hdpi/ic_menu_trash_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_circle_disable.png b/res/drawable-mdpi/btn_circle_disable.png
deleted file mode 100644
index 33b74a6..0000000
--- a/res/drawable-mdpi/btn_circle_disable.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_circle_disable_focused.png b/res/drawable-mdpi/btn_circle_disable_focused.png
deleted file mode 100644
index 005ad8d..0000000
--- a/res/drawable-mdpi/btn_circle_disable_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_circle_normal.png b/res/drawable-mdpi/btn_circle_normal.png
deleted file mode 100644
index fc5af1c..0000000
--- a/res/drawable-mdpi/btn_circle_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_circle_pressed.png b/res/drawable-mdpi/btn_circle_pressed.png
deleted file mode 100644
index 8f40afd..0000000
--- a/res/drawable-mdpi/btn_circle_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_circle_selected.png b/res/drawable-mdpi/btn_circle_selected.png
deleted file mode 100644
index c74fac2..0000000
--- a/res/drawable-mdpi/btn_circle_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_minus_disabled_focused_holo_light.png b/res/drawable-mdpi/btn_minus_disabled_focused_holo_light.png
deleted file mode 100644
index 1550bb8..0000000
--- a/res/drawable-mdpi/btn_minus_disabled_focused_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_minus_disabled_holo_light.png b/res/drawable-mdpi/btn_minus_disabled_holo_light.png
deleted file mode 100644
index b2a6cd1..0000000
--- a/res/drawable-mdpi/btn_minus_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_minus_focused_holo_light.png b/res/drawable-mdpi/btn_minus_focused_holo_light.png
deleted file mode 100644
index c1baee9..0000000
--- a/res/drawable-mdpi/btn_minus_focused_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_minus_normal_holo_light.png b/res/drawable-mdpi/btn_minus_normal_holo_light.png
deleted file mode 100644
index adcb921..0000000
--- a/res/drawable-mdpi/btn_minus_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_minus_pressed_holo_light.png b/res/drawable-mdpi/btn_minus_pressed_holo_light.png
deleted file mode 100644
index 703ea3c..0000000
--- a/res/drawable-mdpi/btn_minus_pressed_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_plus_disabled_focused_holo_light.png b/res/drawable-mdpi/btn_plus_disabled_focused_holo_light.png
deleted file mode 100644
index 1f175be..0000000
--- a/res/drawable-mdpi/btn_plus_disabled_focused_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_plus_disabled_holo_light.png b/res/drawable-mdpi/btn_plus_disabled_holo_light.png
deleted file mode 100644
index b6fcd60..0000000
--- a/res/drawable-mdpi/btn_plus_disabled_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_plus_focused_holo_light.png b/res/drawable-mdpi/btn_plus_focused_holo_light.png
deleted file mode 100644
index a8bf668..0000000
--- a/res/drawable-mdpi/btn_plus_focused_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_plus_normal_holo_light.png b/res/drawable-mdpi/btn_plus_normal_holo_light.png
deleted file mode 100644
index 8e9c9fc..0000000
--- a/res/drawable-mdpi/btn_plus_normal_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_plus_pressed_holo_light.png b/res/drawable-mdpi/btn_plus_pressed_holo_light.png
deleted file mode 100644
index 1c1b822..0000000
--- a/res/drawable-mdpi/btn_plus_pressed_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_btn_round_less.png b/res/drawable-mdpi/ic_btn_round_less.png
deleted file mode 100644
index a9b5bed..0000000
--- a/res/drawable-mdpi/ic_btn_round_less.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_btn_round_more.png b/res/drawable-mdpi/ic_btn_round_more.png
deleted file mode 100644
index ebdc55c..0000000
--- a/res/drawable-mdpi/ic_btn_round_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_accounts_holo_light.png b/res/drawable-mdpi/ic_menu_accounts_holo_light.png
new file mode 100644
index 0000000..5b85ad3
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_accounts_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_accounts_normal_holo.png b/res/drawable-mdpi/ic_menu_accounts_normal_holo.png
deleted file mode 100644
index 32e1d44..0000000
--- a/res/drawable-mdpi/ic_menu_accounts_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_accounts_pressed_holo.png b/res/drawable-mdpi/ic_menu_accounts_pressed_holo.png
deleted file mode 100644
index 051bd5d..0000000
--- a/res/drawable-mdpi/ic_menu_accounts_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_contact_holo_light.png b/res/drawable-mdpi/ic_menu_add_contact_holo_light.png
new file mode 100644
index 0000000..9828826
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_contact_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_contact_normal_holo.png b/res/drawable-mdpi/ic_menu_add_contact_normal_holo.png
deleted file mode 100644
index a881568..0000000
--- a/res/drawable-mdpi/ic_menu_add_contact_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_contact_pressed_holo.png b/res/drawable-mdpi/ic_menu_add_contact_pressed_holo.png
deleted file mode 100644
index 0dd8682..0000000
--- a/res/drawable-mdpi/ic_menu_add_contact_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_field_normal_holo_light.png b/res/drawable-mdpi/ic_menu_add_field_normal_holo_light.png
new file mode 100644
index 0000000..927154b
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_field_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_field_pressed_holo_light.png b/res/drawable-mdpi/ic_menu_add_field_pressed_holo_light.png
new file mode 100644
index 0000000..a340e41
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_field_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_cancel_holo_light.png b/res/drawable-mdpi/ic_menu_cancel_holo_light.png
new file mode 100644
index 0000000..ccea047
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_cancel_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_cancel_normal_holo.png b/res/drawable-mdpi/ic_menu_cancel_normal_holo.png
deleted file mode 100644
index 2de790f..0000000
--- a/res/drawable-mdpi/ic_menu_cancel_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_cancel_pressed_holo.png b/res/drawable-mdpi/ic_menu_cancel_pressed_holo.png
deleted file mode 100644
index 0bd6a5c..0000000
--- a/res/drawable-mdpi/ic_menu_cancel_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_compose_holo_light.png b/res/drawable-mdpi/ic_menu_compose_holo_light.png
new file mode 100644
index 0000000..4f4f653
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_compose_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_compose_normal_holo.png b/res/drawable-mdpi/ic_menu_compose_normal_holo.png
deleted file mode 100644
index 2d58037..0000000
--- a/res/drawable-mdpi/ic_menu_compose_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_compose_pressed_holo.png b/res/drawable-mdpi/ic_menu_compose_pressed_holo.png
deleted file mode 100644
index c54be2b..0000000
--- a/res/drawable-mdpi/ic_menu_compose_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_done_holo_light.png b/res/drawable-mdpi/ic_menu_done_holo_light.png
new file mode 100644
index 0000000..a72b015
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_done_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_done_normal_holo.png b/res/drawable-mdpi/ic_menu_done_normal_holo.png
deleted file mode 100644
index f00a0fd..0000000
--- a/res/drawable-mdpi/ic_menu_done_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_done_pressed_holo.png b/res/drawable-mdpi/ic_menu_done_pressed_holo.png
deleted file mode 100644
index cc89b49..0000000
--- a/res/drawable-mdpi/ic_menu_done_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_expander_maximized_normal_holo_light.png b/res/drawable-mdpi/ic_menu_expander_maximized_normal_holo_light.png
new file mode 100644
index 0000000..7e03eee
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_expander_maximized_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_expander_maximized_pressed_holo_light.png b/res/drawable-mdpi/ic_menu_expander_maximized_pressed_holo_light.png
new file mode 100644
index 0000000..cb64494
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_expander_maximized_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_expander_minimized_normal_holo_light.png b/res/drawable-mdpi/ic_menu_expander_minimized_normal_holo_light.png
new file mode 100644
index 0000000..9c95bf2
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_expander_minimized_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_expander_minimized_pressed_holo_light.png b/res/drawable-mdpi/ic_menu_expander_minimized_pressed_holo_light.png
new file mode 100644
index 0000000..6a6776a
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_expander_minimized_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_import_export_holo_light.png b/res/drawable-mdpi/ic_menu_import_export_holo_light.png
new file mode 100644
index 0000000..1ef004a
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_import_export_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_import_export_normal_holo.png b/res/drawable-mdpi/ic_menu_import_export_normal_holo.png
deleted file mode 100644
index bf18852..0000000
--- a/res/drawable-mdpi/ic_menu_import_export_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_import_export_pressed_holo.png b/res/drawable-mdpi/ic_menu_import_export_pressed_holo.png
deleted file mode 100644
index b7c5547..0000000
--- a/res/drawable-mdpi/ic_menu_import_export_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_merge_holo_light.png b/res/drawable-mdpi/ic_menu_merge_holo_light.png
new file mode 100644
index 0000000..48dad51
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_merge_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_merge_normal_holo.png b/res/drawable-mdpi/ic_menu_merge_normal_holo.png
deleted file mode 100644
index 79c92f9..0000000
--- a/res/drawable-mdpi/ic_menu_merge_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_merge_pressed_holo.png b/res/drawable-mdpi/ic_menu_merge_pressed_holo.png
deleted file mode 100644
index 939014d..0000000
--- a/res/drawable-mdpi/ic_menu_merge_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_remove_field_normal_holo_light.png b/res/drawable-mdpi/ic_menu_remove_field_normal_holo_light.png
new file mode 100644
index 0000000..72e1801
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_remove_field_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_remove_field_pressed_holo_light.png b/res/drawable-mdpi/ic_menu_remove_field_pressed_holo_light.png
new file mode 100644
index 0000000..10835fe
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_remove_field_pressed_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_settings_holo_light.png b/res/drawable-mdpi/ic_menu_settings_holo_light.png
new file mode 100644
index 0000000..698b9167
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_settings_normal_holo.png b/res/drawable-mdpi/ic_menu_settings_normal_holo.png
deleted file mode 100644
index c5d6db2..0000000
--- a/res/drawable-mdpi/ic_menu_settings_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_settings_pressed_holo.png b/res/drawable-mdpi/ic_menu_settings_pressed_holo.png
deleted file mode 100644
index 9d5299a..0000000
--- a/res/drawable-mdpi/ic_menu_settings_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_share_holo_light.png b/res/drawable-mdpi/ic_menu_share_holo_light.png
new file mode 100644
index 0000000..e736f38
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_share_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_share_normal_holo.png b/res/drawable-mdpi/ic_menu_share_normal_holo.png
deleted file mode 100644
index 200dc06..0000000
--- a/res/drawable-mdpi/ic_menu_share_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_share_pressed_holo.png b/res/drawable-mdpi/ic_menu_share_pressed_holo.png
deleted file mode 100644
index 7eeee98..0000000
--- a/res/drawable-mdpi/ic_menu_share_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_split_holo_light.png b/res/drawable-mdpi/ic_menu_split_holo_light.png
new file mode 100644
index 0000000..464e7ea
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_split_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_split_normal_holo.png b/res/drawable-mdpi/ic_menu_split_normal_holo.png
deleted file mode 100644
index c061104..0000000
--- a/res/drawable-mdpi/ic_menu_split_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_split_pressed_holo.png b/res/drawable-mdpi/ic_menu_split_pressed_holo.png
deleted file mode 100644
index 269d24d..0000000
--- a/res/drawable-mdpi/ic_menu_split_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_trash_holo_light.png b/res/drawable-mdpi/ic_menu_trash_holo_light.png
new file mode 100644
index 0000000..248b68d
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_trash_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_trash_normal_holo.png b/res/drawable-mdpi/ic_menu_trash_normal_holo.png
deleted file mode 100644
index 7e354c1..0000000
--- a/res/drawable-mdpi/ic_menu_trash_normal_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_trash_pressed_holo.png b/res/drawable-mdpi/ic_menu_trash_pressed_holo.png
deleted file mode 100644
index ee42881..0000000
--- a/res/drawable-mdpi/ic_menu_trash_pressed_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/btn_minus_holo_light.xml b/res/drawable/btn_minus_holo_light.xml
deleted file mode 100644
index 41d3687..0000000
--- a/res/drawable/btn_minus_holo_light.xml
+++ /dev/null
@@ -1,32 +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_enabled="true"
- android:drawable="@drawable/btn_minus_normal_holo_light" />
- <item android:state_window_focused="false" android:state_enabled="false"
- android:drawable="@drawable/btn_minus_disabled_holo_light" />
- <item android:state_pressed="true"
- android:drawable="@drawable/btn_minus_pressed_holo_light" />
- <item android:state_focused="true" android:state_enabled="true"
- android:drawable="@drawable/btn_minus_focused_holo_light" />
- <item android:state_enabled="true"
- android:drawable="@drawable/btn_minus_normal_holo_light" />
- <item android:state_focused="true"
- android:drawable="@drawable/btn_minus_disabled_focused_holo_light" />
- <item
- android:drawable="@drawable/btn_minus_disabled_holo_light" />
-</selector>
diff --git a/res/drawable/btn_plus_holo_light.xml b/res/drawable/btn_plus_holo_light.xml
deleted file mode 100644
index ad5f7dc..0000000
--- a/res/drawable/btn_plus_holo_light.xml
+++ /dev/null
@@ -1,32 +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_enabled="true"
- android:drawable="@drawable/btn_plus_normal_holo_light" />
- <item android:state_window_focused="false" android:state_enabled="false"
- android:drawable="@drawable/btn_plus_disabled_holo_light" />
- <item android:state_pressed="true"
- android:drawable="@drawable/btn_plus_pressed_holo_light" />
- <item android:state_focused="true" android:state_enabled="true"
- android:drawable="@drawable/btn_plus_focused_holo_light" />
- <item android:state_enabled="true"
- android:drawable="@drawable/btn_plus_normal_holo_light" />
- <item android:state_focused="true"
- android:drawable="@drawable/btn_plus_disabled_focused_holo_light" />
- <item
- android:drawable="@drawable/btn_plus_disabled_holo_light" />
-</selector>
diff --git a/res/drawable/ic_menu_accounts.xml b/res/drawable/ic_menu_accounts.xml
deleted file mode 100644
index 5ae423a..0000000
--- a/res/drawable/ic_menu_accounts.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true" android:drawable="@drawable/ic_menu_accounts_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_accounts_normal_holo" />
-</selector>
diff --git a/res/drawable/ic_menu_add_contact.xml b/res/drawable/ic_menu_add_contact.xml
deleted file mode 100644
index 4a6c7d9..0000000
--- a/res/drawable/ic_menu_add_contact.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true"
- android:drawable="@drawable/ic_menu_add_contact_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_add_contact_normal_holo" />
-</selector>
diff --git a/res/drawable/btn_circle.xml b/res/drawable/ic_menu_add_field_holo_light.xml
similarity index 63%
copy from res/drawable/btn_circle.xml
copy to res/drawable/ic_menu_add_field_holo_light.xml
index 9208010..c75c262 100644
--- a/res/drawable/btn_circle.xml
+++ b/res/drawable/ic_menu_add_field_holo_light.xml
@@ -15,18 +15,13 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- TODO: Properly specify focused states once we have assets -->
<item android:state_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/btn_circle_normal" />
- <item android:state_window_focused="false" android:state_enabled="false"
- android:drawable="@drawable/btn_circle_disable" />
+ android:drawable="@drawable/ic_menu_add_field_normal_holo_light" />
<item android:state_pressed="true"
- android:drawable="@drawable/btn_circle_pressed" />
+ android:drawable="@drawable/ic_menu_add_field_pressed_holo_light" />
<item android:state_focused="true" android:state_enabled="true"
- android:drawable="@drawable/btn_circle_selected" />
+ android:drawable="@drawable/ic_menu_add_field_normal_holo_light" />
<item android:state_enabled="true"
- android:drawable="@drawable/btn_circle_normal" />
- <item android:state_focused="true"
- android:drawable="@drawable/btn_circle_disable_focused" />
- <item
- android:drawable="@drawable/btn_circle_disable" />
+ android:drawable="@drawable/ic_menu_add_field_normal_holo_light" />
</selector>
diff --git a/res/drawable/ic_menu_cancel.xml b/res/drawable/ic_menu_cancel.xml
deleted file mode 100644
index c528dac..0000000
--- a/res/drawable/ic_menu_cancel.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true"
- android:drawable="@drawable/ic_menu_cancel_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_cancel_normal_holo" />
-</selector>
diff --git a/res/drawable/ic_menu_compose.xml b/res/drawable/ic_menu_compose.xml
deleted file mode 100644
index c53fbdc..0000000
--- a/res/drawable/ic_menu_compose.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true" android:drawable="@drawable/ic_menu_compose_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_compose_normal_holo" />
-</selector>
diff --git a/res/drawable/ic_menu_done.xml b/res/drawable/ic_menu_done.xml
deleted file mode 100644
index 7674e1e..0000000
--- a/res/drawable/ic_menu_done.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true" android:drawable="@drawable/ic_menu_done_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_done_normal_holo" />
-</selector>
diff --git a/res/drawable/btn_circle.xml b/res/drawable/ic_menu_expander_maximized_holo_light.xml
similarity index 63%
copy from res/drawable/btn_circle.xml
copy to res/drawable/ic_menu_expander_maximized_holo_light.xml
index 9208010..43b2fe6 100644
--- a/res/drawable/btn_circle.xml
+++ b/res/drawable/ic_menu_expander_maximized_holo_light.xml
@@ -15,18 +15,13 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- TODO: Properly specify focused states once we have assets -->
<item android:state_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/btn_circle_normal" />
- <item android:state_window_focused="false" android:state_enabled="false"
- android:drawable="@drawable/btn_circle_disable" />
+ android:drawable="@drawable/ic_menu_expander_maximized_normal_holo_light" />
<item android:state_pressed="true"
- android:drawable="@drawable/btn_circle_pressed" />
+ android:drawable="@drawable/ic_menu_expander_maximized_pressed_holo_light" />
<item android:state_focused="true" android:state_enabled="true"
- android:drawable="@drawable/btn_circle_selected" />
+ android:drawable="@drawable/ic_menu_expander_maximized_normal_holo_light" />
<item android:state_enabled="true"
- android:drawable="@drawable/btn_circle_normal" />
- <item android:state_focused="true"
- android:drawable="@drawable/btn_circle_disable_focused" />
- <item
- android:drawable="@drawable/btn_circle_disable" />
+ android:drawable="@drawable/ic_menu_expander_maximized_normal_holo_light" />
</selector>
diff --git a/res/drawable/btn_circle.xml b/res/drawable/ic_menu_expander_minimized_holo_light.xml
similarity index 63%
rename from res/drawable/btn_circle.xml
rename to res/drawable/ic_menu_expander_minimized_holo_light.xml
index 9208010..59597d1 100644
--- a/res/drawable/btn_circle.xml
+++ b/res/drawable/ic_menu_expander_minimized_holo_light.xml
@@ -15,18 +15,13 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- TODO: Properly specify focused states once we have assets -->
<item android:state_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/btn_circle_normal" />
- <item android:state_window_focused="false" android:state_enabled="false"
- android:drawable="@drawable/btn_circle_disable" />
+ android:drawable="@drawable/ic_menu_expander_minimized_normal_holo_light" />
<item android:state_pressed="true"
- android:drawable="@drawable/btn_circle_pressed" />
+ android:drawable="@drawable/ic_menu_expander_minimized_pressed_holo_light" />
<item android:state_focused="true" android:state_enabled="true"
- android:drawable="@drawable/btn_circle_selected" />
+ android:drawable="@drawable/ic_menu_expander_minimized_normal_holo_light" />
<item android:state_enabled="true"
- android:drawable="@drawable/btn_circle_normal" />
- <item android:state_focused="true"
- android:drawable="@drawable/btn_circle_disable_focused" />
- <item
- android:drawable="@drawable/btn_circle_disable" />
+ android:drawable="@drawable/ic_menu_expander_minimized_normal_holo_light" />
</selector>
diff --git a/res/drawable/ic_menu_import_export.xml b/res/drawable/ic_menu_import_export.xml
deleted file mode 100644
index 1167ea1..0000000
--- a/res/drawable/ic_menu_import_export.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true"
- android:drawable="@drawable/ic_menu_import_export_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_import_export_normal_holo" />
-</selector>
diff --git a/res/drawable/ic_menu_merge.xml b/res/drawable/ic_menu_merge.xml
deleted file mode 100644
index 329f573..0000000
--- a/res/drawable/ic_menu_merge.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true" android:drawable="@drawable/ic_menu_merge_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_merge_normal_holo" />
-</selector>
diff --git a/res/drawable/btn_circle.xml b/res/drawable/ic_menu_remove_field_holo_light.xml
similarity index 63%
copy from res/drawable/btn_circle.xml
copy to res/drawable/ic_menu_remove_field_holo_light.xml
index 9208010..85f6dac 100644
--- a/res/drawable/btn_circle.xml
+++ b/res/drawable/ic_menu_remove_field_holo_light.xml
@@ -15,18 +15,13 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- TODO: Properly specify focused states once we have assets -->
<item android:state_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/btn_circle_normal" />
- <item android:state_window_focused="false" android:state_enabled="false"
- android:drawable="@drawable/btn_circle_disable" />
+ android:drawable="@drawable/ic_menu_remove_field_normal_holo_light" />
<item android:state_pressed="true"
- android:drawable="@drawable/btn_circle_pressed" />
+ android:drawable="@drawable/ic_menu_remove_field_pressed_holo_light" />
<item android:state_focused="true" android:state_enabled="true"
- android:drawable="@drawable/btn_circle_selected" />
+ android:drawable="@drawable/ic_menu_remove_field_normal_holo_light" />
<item android:state_enabled="true"
- android:drawable="@drawable/btn_circle_normal" />
- <item android:state_focused="true"
- android:drawable="@drawable/btn_circle_disable_focused" />
- <item
- android:drawable="@drawable/btn_circle_disable" />
+ android:drawable="@drawable/ic_menu_remove_field_normal_holo_light" />
</selector>
diff --git a/res/drawable/ic_menu_settings.xml b/res/drawable/ic_menu_settings.xml
deleted file mode 100644
index 4e21d05..0000000
--- a/res/drawable/ic_menu_settings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true" android:drawable="@drawable/ic_menu_settings_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_settings_normal_holo" />
-</selector>
diff --git a/res/drawable/ic_menu_share.xml b/res/drawable/ic_menu_share.xml
deleted file mode 100644
index ff6f2b9..0000000
--- a/res/drawable/ic_menu_share.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true" android:drawable="@drawable/ic_menu_share_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_share_normal_holo" />
-</selector>
diff --git a/res/drawable/ic_menu_split.xml b/res/drawable/ic_menu_split.xml
deleted file mode 100644
index 4a88455..0000000
--- a/res/drawable/ic_menu_split.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true" android:drawable="@drawable/ic_menu_split_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_split_normal_holo" />
-</selector>
diff --git a/res/drawable/ic_menu_trash.xml b/res/drawable/ic_menu_trash.xml
deleted file mode 100644
index e383ded..0000000
--- a/res/drawable/ic_menu_trash.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="true" android:drawable="@drawable/ic_menu_trash_pressed_holo" />
- <item android:drawable="@drawable/ic_menu_trash_normal_holo" />
-</selector>
diff --git a/res/layout-xlarge/item_group_membership.xml b/res/layout-xlarge/item_group_membership.xml
index 1da19d4..d0b393f 100644
--- a/res/layout-xlarge/item_group_membership.xml
+++ b/res/layout-xlarge/item_group_membership.xml
@@ -51,7 +51,7 @@
android:paddingRight="@dimen/editor_round_button_padding_right"
android:paddingTop="@dimen/editor_round_button_padding_top"
android:paddingBottom="@dimen/editor_round_button_padding_bottom"
- android:src="@drawable/btn_plus_holo_light"
+ android:src="@drawable/ic_menu_add_field_holo_light"
android:background="@null"
android:visibility="invisible" />
<ImageButton
@@ -61,7 +61,7 @@
android:paddingRight="@dimen/editor_round_button_padding_right"
android:paddingTop="@dimen/editor_round_button_padding_top"
android:paddingBottom="@dimen/editor_round_button_padding_bottom"
- android:src="@drawable/btn_minus_holo_light"
+ android:src="@drawable/ic_menu_remove_field_holo_light"
android:background="@null"
android:visibility="invisible" />
</com.android.contacts.views.editor.GroupMembershipView>
diff --git a/res/layout-xlarge/item_kind_section.xml b/res/layout-xlarge/item_kind_section.xml
index 2ed79e4..6c6c9e7 100644
--- a/res/layout-xlarge/item_kind_section.xml
+++ b/res/layout-xlarge/item_kind_section.xml
@@ -48,7 +48,7 @@
android:paddingRight="@dimen/editor_round_button_padding_right"
android:paddingTop="@dimen/editor_round_button_padding_top"
android:paddingBottom="@dimen/editor_round_button_padding_bottom"
- android:src="@drawable/btn_plus_holo_light"
android:background="@null"
+ android:src="@drawable/ic_menu_add_field_holo_light"
android:contentDescription="@string/description_plus_button" />
</com.android.contacts.views.editor.KindSectionView>
diff --git a/res/layout/item_kind_section.xml b/res/layout/item_kind_section.xml
index 39dfd70..9262cb2 100644
--- a/res/layout/item_kind_section.xml
+++ b/res/layout/item_kind_section.xml
@@ -58,7 +58,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:duplicateParentState="true"
- android:background="@drawable/btn_plus_holo_light"
+ android:background="@null"
+ android:src="@drawable/ic_menu_add_field_holo_light"
android:paddingLeft="@dimen/editor_round_button_padding_left"
android:paddingRight="@dimen/editor_round_button_padding_right"
android:paddingTop="@dimen/editor_round_button_padding_top"
diff --git a/res/layout/preference_with_more_button.xml b/res/layout/preference_with_more_button.xml
index 93b8d5b..e61f891 100644
--- a/res/layout/preference_with_more_button.xml
+++ b/res/layout/preference_with_more_button.xml
@@ -58,7 +58,7 @@
</RelativeLayout>
<ImageView
- style="@style/MoreButton"
+ android:src="@drawable/ic_menu_expander_minimized_holo_light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
diff --git a/res/menu/actions.xml b/res/menu/actions.xml
index f431a97..8afd8c2 100644
--- a/res/menu/actions.xml
+++ b/res/menu/actions.xml
@@ -20,17 +20,17 @@
<item
android:id="@+id/menu_settings"
- android:icon="@drawable/ic_menu_settings"
+ android:icon="@drawable/ic_menu_settings_holo_light"
android:title="@string/menu_settings" />
<item
android:id="@+id/menu_accounts"
- android:icon="@drawable/ic_menu_accounts"
+ android:icon="@drawable/ic_menu_accounts_holo_light"
android:title="@string/menu_accounts" />
<item
android:id="@+id/menu_import_export"
- android:icon="@drawable/ic_menu_import_export"
+ android:icon="@drawable/ic_menu_import_export_holo_light"
android:title="@string/menu_import_export" />
</menu>
diff --git a/res/menu/edit.xml b/res/menu/edit.xml
index 40fbf2d..379908b 100644
--- a/res/menu/edit.xml
+++ b/res/menu/edit.xml
@@ -18,33 +18,34 @@
<item
android:id="@+id/menu_done"
android:alphabeticShortcut="\n"
- android:icon="@drawable/ic_menu_done"
+ android:icon="@drawable/ic_menu_done_holo_light"
android:title="@string/menu_done"
android:showAsAction="always" />
<item
android:id="@+id/menu_discard"
android:alphabeticShortcut="q"
- android:icon="@drawable/ic_menu_cancel"
- android:title="@string/menu_doNotSave" />
+ android:icon="@drawable/ic_menu_cancel_holo_light"
+ android:title="@string/menu_doNotSave"
+ android:showAsAction="always" />
<item
android:id="@+id/menu_add_raw_contact"
- android:icon="@drawable/ic_menu_add_contact"
+ android:icon="@drawable/ic_menu_add_contact_holo_light"
android:title="@string/menu_newContact" />
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/ic_menu_trash"
+ android:icon="@drawable/ic_menu_trash_holo_light"
android:title="@string/menu_deleteContact" />
<item
android:id="@+id/menu_split"
- android:icon="@drawable/ic_menu_split"
+ android:icon="@drawable/ic_menu_split_holo_light"
android:title="@string/menu_splitAggregate" />
<item
android:id="@+id/menu_join"
- android:icon="@drawable/ic_menu_merge"
+ android:icon="@drawable/ic_menu_merge_holo_light"
android:title="@string/menu_joinAggregate" />
</menu>
diff --git a/res/menu/list.xml b/res/menu/list.xml
index 327c3ca..2b3f453 100644
--- a/res/menu/list.xml
+++ b/res/menu/list.xml
@@ -22,7 +22,7 @@
<item
android:id="@+id/menu_add"
- android:icon="@drawable/ic_menu_add_contact"
+ android:icon="@drawable/ic_menu_add_contact_holo_light"
android:title="@string/menu_newContact"
android:alphabeticShortcut="n" />
@@ -33,12 +33,12 @@
<item
android:id="@+id/menu_accounts"
- android:icon="@drawable/ic_menu_accounts"
+ android:icon="@drawable/ic_menu_accounts_holo_light"
android:title="@string/menu_accounts" />
<item
android:id="@+id/menu_import_export"
- android:icon="@drawable/ic_menu_import_export"
+ android:icon="@drawable/ic_menu_import_export_holo_light"
android:title="@string/menu_import_export" />
</menu>
diff --git a/res/menu/view.xml b/res/menu/view.xml
index f33a3f1..733ab25 100644
--- a/res/menu/view.xml
+++ b/res/menu/view.xml
@@ -17,14 +17,14 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_edit"
- android:icon="@drawable/ic_menu_compose"
+ android:icon="@drawable/ic_menu_compose_holo_light"
android:title="@string/menu_editContact"
android:alphabeticShortcut="e"
android:showAsAction="always" />
<item
android:id="@+id/menu_share"
- android:icon="@drawable/ic_menu_share"
+ android:icon="@drawable/ic_menu_share_holo_light"
android:title="@string/menu_share"
android:alphabeticShortcut="s" />
@@ -35,6 +35,6 @@
<item
android:id="@+id/menu_delete"
- android:icon="@drawable/ic_menu_trash"
+ android:icon="@drawable/ic_menu_trash_holo_light"
android:title="@string/menu_deleteContact" />
</menu>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ccf60ae..0aff359 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,20 +19,6 @@
<item name="android:windowContentOverlay">@null</item>
</style>
-
-
- <!-- TODO: Once there are assets for More/Less buttons, remove these styles -->
- <style name="EmptyButton">
- <item name="android:background">@drawable/btn_circle</item>
- </style>
-
- <style name="MoreButton">
- <item name="android:background">@drawable/btn_circle</item>
- <item name="android:src">@drawable/ic_btn_round_more</item>
- </style>
-
-
-
<style name="CallDetailActivityTheme" parent="android:Theme.NoTitleBar">
<item name="android:windowContentOverlay">@null</item>
</style>
diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index c3ebd64..228389d 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -218,7 +218,7 @@
mActionBarAdapter.setContactListFilterController(mContactListFilterController);
// TODO: request may ask for FREQUENT - set the filter accordingly
mAddContactImageView = new ImageView(this);
- mAddContactImageView.setImageResource(R.drawable.ic_menu_add_contact);
+ mAddContactImageView.setImageResource(R.drawable.ic_menu_add_contact_holo_light);
mAddContactImageView.setContentDescription(getString(R.string.menu_newContact));
mAddContactImageView.setOnClickListener(new OnClickListener() {
@Override
diff --git a/src/com/android/contacts/views/editor/LabeledEditorView.java b/src/com/android/contacts/views/editor/LabeledEditorView.java
index c3baf77..ce236b2 100644
--- a/src/com/android/contacts/views/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/views/editor/LabeledEditorView.java
@@ -159,8 +159,8 @@
private void setupDeleteButton(boolean shouldExist) {
if (shouldExist && mDelete == null) {
mDelete = new ImageButton(mContext);
+ mDelete.setImageResource(R.drawable.ic_menu_remove_field_holo_light);
mDelete.setBackgroundDrawable(null);
- mDelete.setImageResource(R.drawable.btn_minus_holo_light);
final Resources resources = mContext.getResources();
mDelete.setPadding(
resources.getDimensionPixelOffset(R.dimen.editor_round_button_padding_left),
diff --git a/src/com/android/contacts/views/editor/TextFieldsEditorView.java b/src/com/android/contacts/views/editor/TextFieldsEditorView.java
index 2dd9a4f..bac33f1 100644
--- a/src/com/android/contacts/views/editor/TextFieldsEditorView.java
+++ b/src/com/android/contacts/views/editor/TextFieldsEditorView.java
@@ -25,6 +25,7 @@
import android.content.Context;
import android.content.Entity;
+import android.content.res.Resources;
import android.graphics.Rect;
import android.os.Parcel;
import android.os.Parcelable;
@@ -133,13 +134,20 @@
private void setupMoreOrLessButton(boolean shouldExist, boolean collapsed) {
if (shouldExist) {
if (mMoreOrLess == null) {
- // Unfortunately, the style passed as constructor-parameter is mostly ignored,
- // so we have to set the Background and Image seperately. However, if it is not
- // given, the size of the control is wrong
- mMoreOrLess = new ImageButton(mContext, null, R.style.EmptyButton);
+ mMoreOrLess = new ImageButton(mContext);
+ mMoreOrLess.setBackgroundDrawable(null);
+ final Resources resources = mContext.getResources();
+ mMoreOrLess.setPadding(
+ resources.getDimensionPixelOffset(
+ R.dimen.editor_round_button_padding_left),
+ resources.getDimensionPixelOffset(
+ R.dimen.editor_round_button_padding_top),
+ resources.getDimensionPixelOffset(
+ R.dimen.editor_round_button_padding_right),
+ resources.getDimensionPixelOffset(
+ R.dimen.editor_round_button_padding_bottom));
mMoreOrLess.setLayoutParams(
new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
- mMoreOrLess.setBackgroundResource(R.drawable.btn_circle);
mMoreOrLess.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
@@ -163,8 +171,9 @@
});
addView(mMoreOrLess);
}
- mMoreOrLess.setImageResource(
- collapsed ? R.drawable.ic_btn_round_more : R.drawable.ic_btn_round_less);
+ mMoreOrLess.setImageResource(collapsed
+ ? R.drawable.ic_menu_expander_minimized_holo_light
+ : R.drawable.ic_menu_expander_maximized_holo_light);
} else if (mMoreOrLess != null) {
removeView(mMoreOrLess);
mMoreOrLess = null;
