diff --git a/res/drawable/add_call.xml b/res/drawable/add_call.xml index e959e24fd..b3589eb49 100644 --- a/res/drawable/add_call.xml +++ b/res/drawable/add_call.xml @@ -3,5 +3,5 @@ + android:drawable="@drawable/add_call_default" /> diff --git a/res/drawable/add_call_actif.png b/res/drawable/add_call_default.png similarity index 100% rename from res/drawable/add_call_actif.png rename to res/drawable/add_call_default.png diff --git a/res/drawable/add_contact.xml b/res/drawable/add_contact.xml index 10690779a..c100ec00b 100644 --- a/res/drawable/add_contact.xml +++ b/res/drawable/add_contact.xml @@ -3,8 +3,8 @@ + android:drawable="@drawable/add_contact_disabled" /> + android:drawable="@drawable/add_contact_default" /> diff --git a/res/drawable/add_contact_actif.png b/res/drawable/add_contact_default.png similarity index 100% rename from res/drawable/add_contact_actif.png rename to res/drawable/add_contact_default.png diff --git a/res/drawable/add_contact_inactif.png b/res/drawable/add_contact_disabled.png similarity index 100% rename from res/drawable/add_contact_inactif.png rename to res/drawable/add_contact_disabled.png diff --git a/res/drawable/all_contacts.xml b/res/drawable/all_contacts.xml index df9f5d634..6746f8f0f 100644 --- a/res/drawable/all_contacts.xml +++ b/res/drawable/all_contacts.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/all_selected" /> + android:drawable="@drawable/all_default" /> diff --git a/res/drawable/all_actif.png b/res/drawable/all_default.png similarity index 100% rename from res/drawable/all_actif.png rename to res/drawable/all_default.png diff --git a/res/drawable/all_selectionne.png b/res/drawable/all_selected.png similarity index 100% rename from res/drawable/all_selectionne.png rename to res/drawable/all_selected.png diff --git a/res/drawable/backspace.xml b/res/drawable/backspace.xml index 654c9a576..6f2a75a42 100644 --- a/res/drawable/backspace.xml +++ b/res/drawable/backspace.xml @@ -3,6 +3,6 @@ + android:drawable="@drawable/backspace_default" /> diff --git a/res/drawable/backspace_actif.png b/res/drawable/backspace_default.png similarity index 100% rename from res/drawable/backspace_actif.png rename to res/drawable/backspace_default.png diff --git a/res/drawable/barre_noire_top.png b/res/drawable/barre_noire_top.png deleted file mode 100644 index 001991fb0..000000000 Binary files a/res/drawable/barre_noire_top.png and /dev/null differ diff --git a/res/drawable/button.xml b/res/drawable/button.xml index 53dd273e4..ab6a95baa 100644 --- a/res/drawable/button.xml +++ b/res/drawable/button.xml @@ -3,5 +3,5 @@ + android:drawable="@drawable/button_background_default" /> \ No newline at end of file diff --git a/res/drawable/button_background_actif.png b/res/drawable/button_background_default.png similarity index 100% rename from res/drawable/button_background_actif.png rename to res/drawable/button_background_default.png diff --git a/res/drawable/call.xml b/res/drawable/call.xml index a81d47745..e9355926a 100644 --- a/res/drawable/call.xml +++ b/res/drawable/call.xml @@ -1,7 +1,8 @@ + android:drawable="@drawable/call_over" /> - \ No newline at end of file + android:drawable="@drawable/call_default" /> + + diff --git a/res/drawable/detail.xml b/res/drawable/call_answer.xml similarity index 55% rename from res/drawable/detail.xml rename to res/drawable/call_answer.xml index 2596026aa..a81d47745 100644 --- a/res/drawable/detail.xml +++ b/res/drawable/call_answer.xml @@ -1,7 +1,7 @@ + android:drawable="@drawable/call_answer_over" /> + android:drawable="@drawable/call_answer_default" /> \ No newline at end of file diff --git a/res/drawable/appeler_actif.png b/res/drawable/call_default.png similarity index 100% rename from res/drawable/appeler_actif.png rename to res/drawable/call_default.png diff --git a/res/drawable/appeler_over.png b/res/drawable/call_over.png similarity index 100% rename from res/drawable/appeler_over.png rename to res/drawable/call_over.png diff --git a/res/drawable/quality_call_0.png b/res/drawable/call_quality_indicator_0.png similarity index 100% rename from res/drawable/quality_call_0.png rename to res/drawable/call_quality_indicator_0.png diff --git a/res/drawable/quality_call_1.png b/res/drawable/call_quality_indicator_1.png similarity index 100% rename from res/drawable/quality_call_1.png rename to res/drawable/call_quality_indicator_1.png diff --git a/res/drawable/quality_call_2.png b/res/drawable/call_quality_indicator_2.png similarity index 100% rename from res/drawable/quality_call_2.png rename to res/drawable/call_quality_indicator_2.png diff --git a/res/drawable/quality_call_3.png b/res/drawable/call_quality_indicator_3.png similarity index 100% rename from res/drawable/quality_call_3.png rename to res/drawable/call_quality_indicator_3.png diff --git a/res/drawable/incoming_call.png b/res/drawable/call_status_incoming.png similarity index 100% rename from res/drawable/incoming_call.png rename to res/drawable/call_status_incoming.png diff --git a/res/drawable/missed_call.png b/res/drawable/call_status_missed.png similarity index 100% rename from res/drawable/missed_call.png rename to res/drawable/call_status_missed.png diff --git a/res/drawable/outgoing_call.png b/res/drawable/call_status_outgoing.png similarity index 100% rename from res/drawable/outgoing_call.png rename to res/drawable/call_status_outgoing.png diff --git a/res/drawable/cancel_white_bg_default.png b/res/drawable/cancel_white_bg_default.png index b68fb8744..d7088080a 100644 Binary files a/res/drawable/cancel_white_bg_default.png and b/res/drawable/cancel_white_bg_default.png differ diff --git a/res/drawable/cancel_white_bg_disabled.png b/res/drawable/cancel_white_bg_disabled.png index f07f35e2d..d6e641fa5 100644 Binary files a/res/drawable/cancel_white_bg_disabled.png and b/res/drawable/cancel_white_bg_disabled.png differ diff --git a/res/drawable/cancel_white_bg_over.png b/res/drawable/cancel_white_bg_over.png index 7b045d222..d06321994 100644 Binary files a/res/drawable/cancel_white_bg_over.png and b/res/drawable/cancel_white_bg_over.png differ diff --git a/res/drawable/chat.xml b/res/drawable/chat.xml index e3c283277..a7a0da6b3 100644 --- a/res/drawable/chat.xml +++ b/res/drawable/chat.xml @@ -3,7 +3,7 @@ + android:drawable="@drawable/chat_selected" /> + android:drawable="@drawable/chat_default" /> diff --git a/res/drawable/chat_bubble_incoming.9.png b/res/drawable/chat_bubble_incoming.9.png index 6fcc66336..68ef2b302 100644 Binary files a/res/drawable/chat_bubble_incoming.9.png and b/res/drawable/chat_bubble_incoming.9.png differ diff --git a/res/drawable/chat_bubble_outgoing.9.png b/res/drawable/chat_bubble_outgoing.9.png index 363e398b7..1aa640f8c 100644 Binary files a/res/drawable/chat_bubble_outgoing.9.png and b/res/drawable/chat_bubble_outgoing.9.png differ diff --git a/res/drawable/chat_actif.png b/res/drawable/chat_default.png similarity index 100% rename from res/drawable/chat_actif.png rename to res/drawable/chat_default.png diff --git a/res/drawable/chat_edit.xml b/res/drawable/chat_edit.xml index 025218616..8722d6690 100644 --- a/res/drawable/chat_edit.xml +++ b/res/drawable/chat_edit.xml @@ -3,6 +3,6 @@ + android:drawable="@drawable/chat_edit_default" /> diff --git a/res/drawable/chat_edit_actif.png b/res/drawable/chat_edit_default.png similarity index 100% rename from res/drawable/chat_edit_actif.png rename to res/drawable/chat_edit_default.png diff --git a/res/drawable/chat_new.xml b/res/drawable/chat_new.xml index c84b2d2b8..e42e5819c 100644 --- a/res/drawable/chat_new.xml +++ b/res/drawable/chat_new.xml @@ -3,6 +3,6 @@ + android:drawable="@drawable/chat_new_default" /> diff --git a/res/drawable/chat_new_actif.png b/res/drawable/chat_new_default.png similarity index 100% rename from res/drawable/chat_new_actif.png rename to res/drawable/chat_new_default.png diff --git a/res/drawable/chat_ok.xml b/res/drawable/chat_ok.xml index b9c4c463d..3b5a53732 100644 --- a/res/drawable/chat_ok.xml +++ b/res/drawable/chat_ok.xml @@ -3,6 +3,6 @@ + android:drawable="@drawable/chat_ok_default" /> diff --git a/res/drawable/chat_ok_actif.png b/res/drawable/chat_ok_default.png similarity index 100% rename from res/drawable/chat_ok_actif.png rename to res/drawable/chat_ok_default.png diff --git a/res/drawable/chat_selectionne.png b/res/drawable/chat_selected.png similarity index 100% rename from res/drawable/chat_selectionne.png rename to res/drawable/chat_selected.png diff --git a/res/drawable/chat_send_message.xml b/res/drawable/chat_send_message.xml index b77253813..afcfe5074 100644 --- a/res/drawable/chat_send_message.xml +++ b/res/drawable/chat_send_message.xml @@ -3,6 +3,6 @@ + android:drawable="@drawable/chat_send_message_default" /> diff --git a/res/drawable/chat_send_message_actif.png b/res/drawable/chat_send_message_default.png similarity index 100% rename from res/drawable/chat_send_message_actif.png rename to res/drawable/chat_send_message_default.png diff --git a/res/drawable/contacts.xml b/res/drawable/contacts.xml index 93fb4586f..52818fa7d 100644 --- a/res/drawable/contacts.xml +++ b/res/drawable/contacts.xml @@ -3,7 +3,7 @@ + android:drawable="@drawable/contacts_selected" /> + android:drawable="@drawable/contacts_default" /> diff --git a/res/drawable/contacts_actif.png b/res/drawable/contacts_default.png similarity index 100% rename from res/drawable/contacts_actif.png rename to res/drawable/contacts_default.png diff --git a/res/drawable/contacts_selectionne.png b/res/drawable/contacts_selected.png similarity index 100% rename from res/drawable/contacts_selectionne.png rename to res/drawable/contacts_selected.png diff --git a/res/drawable/delete.xml b/res/drawable/delete.xml deleted file mode 100644 index 68faa1b6c..000000000 --- a/res/drawable/delete.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/drawable/dialer.xml b/res/drawable/dialer.xml index bc1087551..345f9eceb 100644 --- a/res/drawable/dialer.xml +++ b/res/drawable/dialer.xml @@ -3,7 +3,7 @@ + android:drawable="@drawable/dialer_selected" /> + android:drawable="@drawable/dialer_default" /> diff --git a/res/drawable/champ_saisie_numero.png b/res/drawable/dialer_address_background.png similarity index 100% rename from res/drawable/champ_saisie_numero.png rename to res/drawable/dialer_address_background.png diff --git a/res/drawable/dialer_alt.xml b/res/drawable/dialer_alt.xml index a4bacb6a8..d18fa3037 100644 --- a/res/drawable/dialer_alt.xml +++ b/res/drawable/dialer_alt.xml @@ -3,6 +3,6 @@ + android:drawable="@drawable/dialer_alt_default" /> diff --git a/res/drawable/dialer_alt_actif.png b/res/drawable/dialer_alt_default.png similarity index 100% rename from res/drawable/dialer_alt_actif.png rename to res/drawable/dialer_alt_default.png diff --git a/res/drawable/dialer_actif.png b/res/drawable/dialer_default.png similarity index 100% rename from res/drawable/dialer_actif.png rename to res/drawable/dialer_default.png diff --git a/res/drawable/dialer_over.png b/res/drawable/dialer_over.png index 2edc47aa3..3727c5fba 100644 Binary files a/res/drawable/dialer_over.png and b/res/drawable/dialer_over.png differ diff --git a/res/drawable/dialer_selectionne.png b/res/drawable/dialer_selected.png similarity index 100% rename from res/drawable/dialer_selectionne.png rename to res/drawable/dialer_selected.png diff --git a/res/drawable/edit.xml b/res/drawable/hangup.xml similarity index 61% rename from res/drawable/edit.xml rename to res/drawable/hangup.xml index 328a21987..7faa23180 100644 --- a/res/drawable/edit.xml +++ b/res/drawable/hangup.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/hangup_over" /> + android:drawable="@drawable/hangup_default" /> diff --git a/res/drawable/raccrocher_actif.png b/res/drawable/hangup_default.png similarity index 100% rename from res/drawable/raccrocher_actif.png rename to res/drawable/hangup_default.png diff --git a/res/drawable/raccrocher_over.png b/res/drawable/hangup_over.png similarity index 100% rename from res/drawable/raccrocher_over.png rename to res/drawable/hangup_over.png diff --git a/res/drawable/history.xml b/res/drawable/history.xml index ee5ee1d28..6f32df31c 100644 --- a/res/drawable/history.xml +++ b/res/drawable/history.xml @@ -3,7 +3,7 @@ + android:drawable="@drawable/history_selected" /> + android:drawable="@drawable/history_default" /> diff --git a/res/drawable/all_call.xml b/res/drawable/history_all.xml similarity index 62% rename from res/drawable/all_call.xml rename to res/drawable/history_all.xml index 82e90c292..2ce87fc7b 100644 --- a/res/drawable/all_call.xml +++ b/res/drawable/history_all.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/history_all_selected" /> + android:drawable="@drawable/history_all_default" /> diff --git a/res/drawable/all_call_actif.png b/res/drawable/history_all_default.png similarity index 100% rename from res/drawable/all_call_actif.png rename to res/drawable/history_all_default.png diff --git a/res/drawable/all_call_selectionne.png b/res/drawable/history_all_selected.png similarity index 100% rename from res/drawable/all_call_selectionne.png rename to res/drawable/history_all_selected.png diff --git a/res/drawable/history_actif.png b/res/drawable/history_default.png similarity index 100% rename from res/drawable/history_actif.png rename to res/drawable/history_default.png diff --git a/res/drawable/history_edit.xml b/res/drawable/history_edit.xml new file mode 100644 index 000000000..a2108f74b --- /dev/null +++ b/res/drawable/history_edit.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/res/drawable/edit_actif.png b/res/drawable/history_edit_default.png similarity index 100% rename from res/drawable/edit_actif.png rename to res/drawable/history_edit_default.png diff --git a/res/drawable/edit_over.png b/res/drawable/history_edit_over.png similarity index 100% rename from res/drawable/edit_over.png rename to res/drawable/history_edit_over.png diff --git a/res/drawable/missed.xml b/res/drawable/history_missed.xml similarity index 57% rename from res/drawable/missed.xml rename to res/drawable/history_missed.xml index 4fd87213d..fef83cb22 100644 --- a/res/drawable/missed.xml +++ b/res/drawable/history_missed.xml @@ -1,7 +1,7 @@ + android:drawable="@drawable/history_missed_selected" /> - \ No newline at end of file + android:drawable="@drawable/history_missed_default" /> + diff --git a/res/drawable/missed_actif.png b/res/drawable/history_missed_default.png similarity index 100% rename from res/drawable/missed_actif.png rename to res/drawable/history_missed_default.png diff --git a/res/drawable/missed_selectionne.png b/res/drawable/history_missed_selected.png similarity index 100% rename from res/drawable/missed_selectionne.png rename to res/drawable/history_missed_selected.png diff --git a/res/drawable/history_selectionne.png b/res/drawable/history_selected.png similarity index 100% rename from res/drawable/history_selectionne.png rename to res/drawable/history_selected.png diff --git a/res/drawable/connected_led.png b/res/drawable/led_connected.png similarity index 100% rename from res/drawable/connected_led.png rename to res/drawable/led_connected.png diff --git a/res/drawable/led_disconnected.png b/res/drawable/led_disconnected.png new file mode 100644 index 000000000..11455fb1b Binary files /dev/null and b/res/drawable/led_disconnected.png differ diff --git a/res/drawable/not_connected_led.png b/res/drawable/led_error.png similarity index 100% rename from res/drawable/not_connected_led.png rename to res/drawable/led_error.png diff --git a/res/drawable/led_inprogress.png b/res/drawable/led_inprogress.png new file mode 100644 index 000000000..d2fe9da56 Binary files /dev/null and b/res/drawable/led_inprogress.png differ diff --git a/res/drawable/linphone_contacts.xml b/res/drawable/linphone_contacts.xml index fc734e9c2..ba9480ade 100644 --- a/res/drawable/linphone_contacts.xml +++ b/res/drawable/linphone_contacts.xml @@ -1,7 +1,7 @@ + android:drawable="@drawable/linphone_selected" /> + android:drawable="@drawable/linphone_default" /> \ No newline at end of file diff --git a/res/drawable/linphone_actif.png b/res/drawable/linphone_default.png similarity index 100% rename from res/drawable/linphone_actif.png rename to res/drawable/linphone_default.png diff --git a/res/drawable/linphone_selectionne.png b/res/drawable/linphone_selected.png similarity index 100% rename from res/drawable/linphone_selectionne.png rename to res/drawable/linphone_selected.png diff --git a/res/drawable/play.xml b/res/drawable/list_delete.xml similarity index 59% rename from res/drawable/play.xml rename to res/drawable/list_delete.xml index 42653fbbf..e8c034ea1 100644 --- a/res/drawable/play.xml +++ b/res/drawable/list_delete.xml @@ -1,8 +1,7 @@ + android:drawable="@drawable/list_delete_over" /> + android:drawable="@drawable/list_delete_default" /> - diff --git a/res/drawable/delete_actif.png b/res/drawable/list_delete_default.png similarity index 100% rename from res/drawable/delete_actif.png rename to res/drawable/list_delete_default.png diff --git a/res/drawable/delete_over.png b/res/drawable/list_delete_over.png similarity index 100% rename from res/drawable/delete_over.png rename to res/drawable/list_delete_over.png diff --git a/res/drawable/list_detail.xml b/res/drawable/list_detail.xml new file mode 100644 index 000000000..275fbd50d --- /dev/null +++ b/res/drawable/list_detail.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/res/drawable/detail_actif.png b/res/drawable/list_detail_default.png similarity index 100% rename from res/drawable/detail_actif.png rename to res/drawable/list_detail_default.png diff --git a/res/drawable/detail_over.png b/res/drawable/list_detail_over.png similarity index 100% rename from res/drawable/detail_over.png rename to res/drawable/list_detail_over.png diff --git a/res/drawable/micro_off.xml b/res/drawable/micro_off.xml index adc966307..eca25c40f 100644 --- a/res/drawable/micro_off.xml +++ b/res/drawable/micro_off.xml @@ -3,5 +3,5 @@ + android:drawable="@drawable/micro_off_default" /> diff --git a/res/drawable/micro_off_actif.png b/res/drawable/micro_off_default.png similarity index 100% rename from res/drawable/micro_off_actif.png rename to res/drawable/micro_off_default.png diff --git a/res/drawable/micro_on.xml b/res/drawable/micro_on.xml index 5b6910e79..cd823c397 100644 --- a/res/drawable/micro_on.xml +++ b/res/drawable/micro_on.xml @@ -3,5 +3,5 @@ + android:drawable="@drawable/micro_on_default" /> diff --git a/res/drawable/micro_on_actif.png b/res/drawable/micro_on_default.png similarity index 100% rename from res/drawable/micro_on_actif.png rename to res/drawable/micro_on_default.png diff --git a/res/drawable/new_contact.xml b/res/drawable/new_contact.xml index 84d70406c..7989160af 100644 --- a/res/drawable/new_contact.xml +++ b/res/drawable/new_contact.xml @@ -5,5 +5,5 @@ + android:drawable="@drawable/new_contact_default" /> diff --git a/res/drawable/new_contact_actif.png b/res/drawable/new_contact_default.png similarity index 100% rename from res/drawable/new_contact_actif.png rename to res/drawable/new_contact_default.png diff --git a/res/drawable/numpad_eight_actif.png b/res/drawable/numpad_eight_actif.png deleted file mode 100644 index a3c0d8033..000000000 Binary files a/res/drawable/numpad_eight_actif.png and /dev/null differ diff --git a/res/drawable/numpad_eight_over.png b/res/drawable/numpad_eight_over.png index a40d8ca49..2ccb7f97c 100644 Binary files a/res/drawable/numpad_eight_over.png and b/res/drawable/numpad_eight_over.png differ diff --git a/res/drawable/numpad_five_actif.png b/res/drawable/numpad_five_actif.png deleted file mode 100644 index 023eee43b..000000000 Binary files a/res/drawable/numpad_five_actif.png and /dev/null differ diff --git a/res/drawable/numpad_five_over.png b/res/drawable/numpad_five_over.png index 3dbb9321f..3b4a62e63 100644 Binary files a/res/drawable/numpad_five_over.png and b/res/drawable/numpad_five_over.png differ diff --git a/res/drawable/numpad_four_actif.png b/res/drawable/numpad_four_actif.png deleted file mode 100644 index fa788a745..000000000 Binary files a/res/drawable/numpad_four_actif.png and /dev/null differ diff --git a/res/drawable/numpad_four_over.png b/res/drawable/numpad_four_over.png index 0097edc4f..2bffe94d5 100644 Binary files a/res/drawable/numpad_four_over.png and b/res/drawable/numpad_four_over.png differ diff --git a/res/drawable/numpad_nine_actif.png b/res/drawable/numpad_nine_actif.png deleted file mode 100644 index 594a49d5f..000000000 Binary files a/res/drawable/numpad_nine_actif.png and /dev/null differ diff --git a/res/drawable/numpad_nine_over.png b/res/drawable/numpad_nine_over.png index 69645647b..c457e8400 100644 Binary files a/res/drawable/numpad_nine_over.png and b/res/drawable/numpad_nine_over.png differ diff --git a/res/drawable/numpad_one_actif.png b/res/drawable/numpad_one_actif.png deleted file mode 100644 index 07f8d0ecf..000000000 Binary files a/res/drawable/numpad_one_actif.png and /dev/null differ diff --git a/res/drawable/numpad_one_over.png b/res/drawable/numpad_one_over.png index 21004f314..abe10c6e7 100644 Binary files a/res/drawable/numpad_one_over.png and b/res/drawable/numpad_one_over.png differ diff --git a/res/drawable/numpad_seven_actif.png b/res/drawable/numpad_seven_actif.png deleted file mode 100644 index 85ea3ddcf..000000000 Binary files a/res/drawable/numpad_seven_actif.png and /dev/null differ diff --git a/res/drawable/numpad_seven_over.png b/res/drawable/numpad_seven_over.png index d5252a251..9ec319835 100644 Binary files a/res/drawable/numpad_seven_over.png and b/res/drawable/numpad_seven_over.png differ diff --git a/res/drawable/numpad_sharp_actif.png b/res/drawable/numpad_sharp_actif.png deleted file mode 100644 index c551d9121..000000000 Binary files a/res/drawable/numpad_sharp_actif.png and /dev/null differ diff --git a/res/drawable/numpad_sharp_over.png b/res/drawable/numpad_sharp_over.png index efa63d7e4..dffb1b062 100644 Binary files a/res/drawable/numpad_sharp_over.png and b/res/drawable/numpad_sharp_over.png differ diff --git a/res/drawable/numpad_six_actif.png b/res/drawable/numpad_six_actif.png deleted file mode 100644 index 5404d14ec..000000000 Binary files a/res/drawable/numpad_six_actif.png and /dev/null differ diff --git a/res/drawable/numpad_six_over.png b/res/drawable/numpad_six_over.png index c782b7281..aee8556d7 100644 Binary files a/res/drawable/numpad_six_over.png and b/res/drawable/numpad_six_over.png differ diff --git a/res/drawable/numpad_star_actif.png b/res/drawable/numpad_star_actif.png deleted file mode 100644 index 6034e1a99..000000000 Binary files a/res/drawable/numpad_star_actif.png and /dev/null differ diff --git a/res/drawable/numpad_star_over.png b/res/drawable/numpad_star_over.png index 9d1b7c65d..ac9639ff7 100644 Binary files a/res/drawable/numpad_star_over.png and b/res/drawable/numpad_star_over.png differ diff --git a/res/drawable/numpad_three_actif.png b/res/drawable/numpad_three_actif.png deleted file mode 100644 index 5a489c493..000000000 Binary files a/res/drawable/numpad_three_actif.png and /dev/null differ diff --git a/res/drawable/numpad_three_over.png b/res/drawable/numpad_three_over.png index 618070a48..8fb1e1dc8 100644 Binary files a/res/drawable/numpad_three_over.png and b/res/drawable/numpad_three_over.png differ diff --git a/res/drawable/numpad_two_actif.png b/res/drawable/numpad_two_actif.png deleted file mode 100644 index 0de47b0bb..000000000 Binary files a/res/drawable/numpad_two_actif.png and /dev/null differ diff --git a/res/drawable/numpad_two_over.png b/res/drawable/numpad_two_over.png index 3f7cc2363..da5f95e90 100644 Binary files a/res/drawable/numpad_two_over.png and b/res/drawable/numpad_two_over.png differ diff --git a/res/drawable/numpad_zero_actif.png b/res/drawable/numpad_zero_actif.png deleted file mode 100644 index 465a3c9f6..000000000 Binary files a/res/drawable/numpad_zero_actif.png and /dev/null differ diff --git a/res/drawable/numpad_zero_over.png b/res/drawable/numpad_zero_over.png index 2c6cb21f4..86c14f38c 100644 Binary files a/res/drawable/numpad_zero_over.png and b/res/drawable/numpad_zero_over.png differ diff --git a/res/drawable/ok.xml b/res/drawable/ok.xml index 5b62217a1..b50da4366 100644 --- a/res/drawable/ok.xml +++ b/res/drawable/ok.xml @@ -3,6 +3,6 @@ + android:drawable="@drawable/ok_default" /> diff --git a/res/drawable/ok_actif.png b/res/drawable/ok_default.png similarity index 100% rename from res/drawable/ok_actif.png rename to res/drawable/ok_default.png diff --git a/res/drawable/pause.xml b/res/drawable/pause_off.xml similarity index 60% rename from res/drawable/pause.xml rename to res/drawable/pause_off.xml index dabbd1e83..3c3479543 100644 --- a/res/drawable/pause.xml +++ b/res/drawable/pause_off.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/pause_off_over" /> + android:drawable="@drawable/pause_off_default" /> diff --git a/res/drawable/pause_actif.png b/res/drawable/pause_off_default.png similarity index 100% rename from res/drawable/pause_actif.png rename to res/drawable/pause_off_default.png diff --git a/res/drawable/pause_over.png b/res/drawable/pause_off_over.png similarity index 100% rename from res/drawable/pause_over.png rename to res/drawable/pause_off_over.png diff --git a/res/drawable/appeler.xml b/res/drawable/pause_on.xml similarity index 60% rename from res/drawable/appeler.xml rename to res/drawable/pause_on.xml index da780bf0d..b6a96d195 100644 --- a/res/drawable/appeler.xml +++ b/res/drawable/pause_on.xml @@ -1,8 +1,8 @@ + android:drawable="@drawable/pause_on_over" /> + android:drawable="@drawable/pause_on_default" /> diff --git a/res/drawable/play_actif.png b/res/drawable/pause_on_default.png similarity index 100% rename from res/drawable/play_actif.png rename to res/drawable/pause_on_default.png diff --git a/res/drawable/play_over.png b/res/drawable/pause_on_over.png similarity index 100% rename from res/drawable/play_over.png rename to res/drawable/pause_on_over.png diff --git a/res/drawable/raccrocher.xml b/res/drawable/raccrocher.xml deleted file mode 100644 index 929411613..000000000 --- a/res/drawable/raccrocher.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/res/drawable/not_secure.png b/res/drawable/security_ko.png similarity index 100% rename from res/drawable/not_secure.png rename to res/drawable/security_ko.png diff --git a/res/drawable/secure.png b/res/drawable/security_ok.png similarity index 100% rename from res/drawable/secure.png rename to res/drawable/security_ok.png diff --git a/res/drawable/maybe_secure.png b/res/drawable/security_pending.png similarity index 100% rename from res/drawable/maybe_secure.png rename to res/drawable/security_pending.png diff --git a/res/drawable/settings.xml b/res/drawable/settings.xml index b3e8b8b2e..365633495 100644 --- a/res/drawable/settings.xml +++ b/res/drawable/settings.xml @@ -3,7 +3,7 @@ + android:drawable="@drawable/settings_selected" /> + android:drawable="@drawable/settings_default" /> diff --git a/res/drawable/settings_actif.png b/res/drawable/settings_default.png similarity index 100% rename from res/drawable/settings_actif.png rename to res/drawable/settings_default.png diff --git a/res/drawable/settings_selectionne.png b/res/drawable/settings_selected.png similarity index 100% rename from res/drawable/settings_selectionne.png rename to res/drawable/settings_selected.png diff --git a/res/drawable/setup_back.xml b/res/drawable/setup_back.xml index 430299a49..c5fb0fbe1 100644 --- a/res/drawable/setup_back.xml +++ b/res/drawable/setup_back.xml @@ -2,6 +2,8 @@ + diff --git a/res/drawable/setup_back_disabled.png b/res/drawable/setup_back_disabled.png new file mode 100644 index 000000000..805084589 Binary files /dev/null and b/res/drawable/setup_back_disabled.png differ diff --git a/res/drawable/setup_cancel.xml b/res/drawable/setup_cancel.xml index 61922945f..e4f34cd9f 100644 --- a/res/drawable/setup_cancel.xml +++ b/res/drawable/setup_cancel.xml @@ -2,6 +2,8 @@ + diff --git a/res/drawable/setup_cancel_disabled.png b/res/drawable/setup_cancel_disabled.png new file mode 100644 index 000000000..30b9978fa Binary files /dev/null and b/res/drawable/setup_cancel_disabled.png differ diff --git a/res/drawable/setup_letsgo_disabled.png b/res/drawable/setup_letsgo_disabled.png new file mode 100644 index 000000000..1c66451b3 Binary files /dev/null and b/res/drawable/setup_letsgo_disabled.png differ diff --git a/res/drawable/setup_next.xml b/res/drawable/setup_next.xml index 79dde1850..505a42a16 100644 --- a/res/drawable/setup_next.xml +++ b/res/drawable/setup_next.xml @@ -2,6 +2,8 @@ + diff --git a/res/drawable/speaker_off.xml b/res/drawable/speaker_off.xml index 3c43342a9..cd145c177 100644 --- a/res/drawable/speaker_off.xml +++ b/res/drawable/speaker_off.xml @@ -3,5 +3,5 @@ + android:drawable="@drawable/speaker_off_default" /> diff --git a/res/drawable/speaker_off_actif.png b/res/drawable/speaker_off_default.png similarity index 100% rename from res/drawable/speaker_off_actif.png rename to res/drawable/speaker_off_default.png diff --git a/res/drawable/speaker_on.xml b/res/drawable/speaker_on.xml index a91c3de7f..19f98e8d3 100644 --- a/res/drawable/speaker_on.xml +++ b/res/drawable/speaker_on.xml @@ -3,5 +3,5 @@ + android:drawable="@drawable/speaker_on_default" /> diff --git a/res/drawable/speaker_on_actif.png b/res/drawable/speaker_on_default.png similarity index 100% rename from res/drawable/speaker_on_actif.png rename to res/drawable/speaker_on_default.png diff --git a/res/drawable/switch_camera_default.png b/res/drawable/switch_camera_default.png index f67fe6312..2145e1db3 100644 Binary files a/res/drawable/switch_camera_default.png and b/res/drawable/switch_camera_default.png differ diff --git a/res/drawable/switch_camera_over.png b/res/drawable/switch_camera_over.png index 2f12f0ea4..649861e9f 100644 Binary files a/res/drawable/switch_camera_over.png and b/res/drawable/switch_camera_over.png differ diff --git a/res/drawable/video_off.xml b/res/drawable/video_off.xml index 55707e63e..871dfe38a 100644 --- a/res/drawable/video_off.xml +++ b/res/drawable/video_off.xml @@ -3,5 +3,5 @@ + android:drawable="@drawable/video_off_default" /> diff --git a/res/drawable/video_off_actif.png b/res/drawable/video_off_default.png similarity index 100% rename from res/drawable/video_off_actif.png rename to res/drawable/video_off_default.png diff --git a/res/drawable/video_on.xml b/res/drawable/video_on.xml index 9f8c66d0b..9fd258697 100644 --- a/res/drawable/video_on.xml +++ b/res/drawable/video_on.xml @@ -3,5 +3,5 @@ + android:drawable="@drawable/video_on_default" /> diff --git a/res/drawable/video_on_actif.png b/res/drawable/video_on_default.png similarity index 100% rename from res/drawable/video_on_actif.png rename to res/drawable/video_on_default.png diff --git a/res/layout/audio.xml b/res/layout/audio.xml index 8db784ef2..c4c65f0e1 100644 --- a/res/layout/audio.xml +++ b/res/layout/audio.xml @@ -7,7 +7,7 @@ diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml index a212e496d..2d56249ed 100644 --- a/res/layout/chatlist_cell.xml +++ b/res/layout/chatlist_cell.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="0.9" - android:src="@drawable/detail" /> + android:src="@drawable/list_detail" /> + android:src="@drawable/list_delete" /> \ No newline at end of file diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml index 23720b9bb..a6e07082d 100644 --- a/res/layout/contact_control_row.xml +++ b/res/layout/contact_control_row.xml @@ -25,7 +25,7 @@ android:paddingLeft="5dp" android:paddingRight="5dp" android:scaleType="fitCenter" - android:src="@drawable/call" /> + android:src="@drawable/call_answer" /> + android:src="@drawable/call" /> @@ -22,7 +22,7 @@ @@ -30,7 +30,7 @@ diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml index 9b2d19976..a1a3f7c74 100644 --- a/res/layout/history_cell.xml +++ b/res/layout/history_cell.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0.9" - android:src="@drawable/incoming_call" + android:src="@drawable/call_status_incoming" android:layout_marginLeft="10dp"/> @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_weight="0.9" android:visibility="gone" - android:src="@drawable/delete" + android:src="@drawable/list_delete" android:layout_marginLeft="10dp" android:layout_marginRight="10dp" /> diff --git a/res/layout/incall.xml b/res/layout/incall.xml index 28891d933..6dfdd11be 100644 --- a/res/layout/incall.xml +++ b/res/layout/incall.xml @@ -49,14 +49,14 @@ android:layout_height="match_parent" android:layout_weight="0.25" android:scaleType="fitXY" - android:src="@drawable/video_on" /> + android:src="@drawable/video_off" /> @@ -91,7 +91,7 @@ android:id="@+id/pause" android:layout_width="match_parent" android:layout_height="match_parent" - android:src="@drawable/pause" + android:src="@drawable/pause_off" android:scaleType="fitXY" android:layout_weight="0.3"/> @@ -100,7 +100,7 @@ android:id="@+id/hangUp" android:layout_width="match_parent" android:layout_height="match_parent" - android:src="@drawable/raccrocher" + android:src="@drawable/hangup" android:scaleType="fitXY" android:layout_weight="0.3"/> diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml index 80d2d347f..f564a16bb 100644 --- a/res/layout/incoming.xml +++ b/res/layout/incoming.xml @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="0.9" - android:background="@drawable/champ_saisie_numero" + android:background="@drawable/dialer_address_background" android:gravity="center_vertical" android:paddingLeft="20dp" android:textColor="@android:color/white" diff --git a/res/layout/status.xml b/res/layout/status.xml index 08697d7e1..0369d38de 100644 --- a/res/layout/status.xml +++ b/res/layout/status.xml @@ -14,7 +14,7 @@ android:contentDescription="@string/content_description_led" android:id="@+id/statusLed" android:paddingLeft="5dp" - android:src="@drawable/not_connected_led" + android:src="@drawable/led_disconnected" android:layout_toRightOf="@id/statusText" android:layout_width="wrap_content" android:layout_height="wrap_content" /> @@ -24,7 +24,7 @@ android:id="@+id/callQuality" android:layout_width="wrap_content" android:layout_height="17dp" - android:src="@drawable/quality_call_0" + android:src="@drawable/call_quality_indicator_0" android:layout_centerHorizontal="true" android:visibility="gone" /> @@ -33,7 +33,7 @@ android:id="@+id/encryption" android:layout_width="wrap_content" android:layout_height="17dp" - android:src="@drawable/maybe_secure" + android:src="@drawable/security_pending" android:visibility="gone" android:layout_alignParentRight="true" /> diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index af1f185ec..03414a04e 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -122,7 +122,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneO LinphoneActivity.instance().onMessageSent(sipUri, messageToSend); } - displayMessage(previousMessageID + 1, messageToSend, "", false, messagesLayout); + displayMessage(previousMessageID + 1, messageToSend, "few seconds ago", false, messagesLayout); scrollToEnd(); } } @@ -138,7 +138,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneO @Override public void onMessageReceived(LinphoneAddress from, String message) { - displayMessage(previousMessageID + 1, message, "", true, messagesLayout); + displayMessage(previousMessageID + 1, message, "few seconds ago", true, messagesLayout); scrollToEnd(); } } diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java index b8ca20440..452c35bc1 100644 --- a/src/org/linphone/DialerFragment.java +++ b/src/org/linphone/DialerFragment.java @@ -59,7 +59,7 @@ public class DialerFragment extends Fragment { if (LinphoneActivity.isInstanciated() && LinphoneActivity.instance().isInCallLayout()) { mCall.setImageResource(R.drawable.plus); } else { - mCall.setImageResource(R.drawable.appeler); + mCall.setImageResource(R.drawable.call); } AddressAware numpad = (AddressAware) view.findViewById(R.id.Dialer); @@ -122,7 +122,7 @@ public class DialerFragment extends Fragment { mAddContact.setImageResource(R.drawable.cancel); mAddContact.setOnClickListener(cancelListener); } else { - mCall.setImageResource(R.drawable.appeler); + mCall.setImageResource(R.drawable.call); mAddContact.setImageResource(R.drawable.add_contact); mAddContact.setOnClickListener(addContactListener); } diff --git a/src/org/linphone/HistoryFragment.java b/src/org/linphone/HistoryFragment.java index 3ac5ac3b1..9b29daaed 100644 --- a/src/org/linphone/HistoryFragment.java +++ b/src/org/linphone/HistoryFragment.java @@ -138,7 +138,7 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem private Bitmap missedCall, outgoingCall, incomingCall; CallHistoryAdapter(Context aContext) { - missedCall = BitmapFactory.decodeResource(getResources(), R.drawable.missed_call); + missedCall = BitmapFactory.decodeResource(getResources(), R.drawable.call_status_missed); if (onlyDisplayMissedCalls) { List missedCalls = new ArrayList(); @@ -149,8 +149,8 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnItem } mLogs = missedCalls; } else { - outgoingCall = BitmapFactory.decodeResource(getResources(), R.drawable.outgoing_call); - incomingCall = BitmapFactory.decodeResource(getResources(), R.drawable.incoming_call); + outgoingCall = BitmapFactory.decodeResource(getResources(), R.drawable.call_status_outgoing); + incomingCall = BitmapFactory.decodeResource(getResources(), R.drawable.call_status_incoming); } } public int getCount() { diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java index 36d4ab31e..74fa772fd 100644 --- a/src/org/linphone/InCallActivity.java +++ b/src/org/linphone/InCallActivity.java @@ -254,13 +254,13 @@ public class InCallActivity extends FragmentActivity implements LinphoneCall call = lc.getCurrentCall(); if (call != null && isCallRunning(call)) { lc.pauseCall(call); - pause.setImageResource(R.drawable.play); + pause.setImageResource(R.drawable.pause_on); } else { List pausedCalls = LinphoneUtils.getCallsInState(lc, Arrays.asList(State.Paused)); if (pausedCalls.size() == 1) { LinphoneCall callToResume = pausedCalls.get(0); lc.resumeCall(callToResume); - pause.setImageResource(R.drawable.pause); + pause.setImageResource(R.drawable.pause_off); } } } diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 599f0df64..4a2776ebe 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -240,6 +240,10 @@ public final class LinphoneService extends Service implements LinphoneServiceLis PendingIntent notifContentIntent = PendingIntent.getActivity(this, 0, notifIntent, PendingIntent.FLAG_CANCEL_CURRENT); + if (fromName == null) { + fromName = fromSipUri; + } + if (mMsgNotif == null) { mMsgNotifCount = 1; mMsgNotif = new Notification(); diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java index e1c681069..f7da537a6 100644 --- a/src/org/linphone/StatusFragment.java +++ b/src/org/linphone/StatusFragment.java @@ -93,10 +93,10 @@ public class StatusFragment extends Fragment { public void run() { try { if (state == RegistrationState.RegistrationOk && LinphoneManager.getLc().getDefaultProxyConfig().isRegistered()) { - statusLed.setImageResource(R.drawable.connected_led); + statusLed.setImageResource(R.drawable.led_connected); statusText.setText(getString(R.string.status_connected)); } else { - statusLed.setImageResource(R.drawable.not_connected_led); + statusLed.setImageResource(R.drawable.led_disconnected); statusText.setText(getString(R.string.status_not_connected)); } } catch (Exception e) { @@ -136,23 +136,23 @@ public class StatusFragment extends Fragment { if (quality >= 4) // Good Quality { callQuality.setImageResource( - R.drawable.quality_call_3); + R.drawable.call_quality_indicator_3); } else if (quality >= 3) // Average quality { callQuality.setImageResource( - R.drawable.quality_call_2); + R.drawable.call_quality_indicator_2); } else if (quality >= 2) // Low quality { callQuality.setImageResource( - R.drawable.quality_call_1); + R.drawable.call_quality_indicator_1); } else if (quality >= 1) // Very low quality { callQuality.setImageResource( - R.drawable.quality_call_1); + R.drawable.call_quality_indicator_1); } else // Worst quality { callQuality.setImageResource( - R.drawable.quality_call_0); + R.drawable.call_quality_indicator_0); } } @@ -165,7 +165,7 @@ public class StatusFragment extends Fragment { refreshEncryptionIcon(); // We are obviously connected - statusLed.setImageResource(R.drawable.connected_led); + statusLed.setImageResource(R.drawable.led_connected); statusText.setText(getString(R.string.status_connected)); } } @@ -188,11 +188,11 @@ public class StatusFragment extends Fragment { encryption.setVisibility(View.VISIBLE); if (mediaEncryption == MediaEncryption.SRTP || (mediaEncryption == MediaEncryption.ZRTP && call.isAuthenticationTokenVerified())) { - encryption.setImageResource(R.drawable.secure); + encryption.setImageResource(R.drawable.security_ok); } else if (mediaEncryption == MediaEncryption.ZRTP && !call.isAuthenticationTokenVerified()) { - encryption.setImageResource(R.drawable.maybe_secure); + encryption.setImageResource(R.drawable.security_pending); } else { - encryption.setImageResource(R.drawable.not_secure); + encryption.setImageResource(R.drawable.security_ko); } } } diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java index 79367db0e..e7259a028 100644 --- a/src/org/linphone/ui/BubbleChat.java +++ b/src/org/linphone/ui/BubbleChat.java @@ -24,6 +24,7 @@ import org.linphone.R; import android.content.Context; import android.graphics.Color; +import android.util.TypedValue; import android.view.View; import android.widget.RelativeLayout; import android.widget.RelativeLayout.LayoutParams; @@ -60,6 +61,7 @@ public class BubbleChat { messageView.setTextColor(Color.BLACK); view.setId(id); + layoutParams.setMargins(0, pixelsToDpi(context, 10), 0, 0); view.setLayoutParams(layoutParams); view.addView(messageView); @@ -80,9 +82,17 @@ public class BubbleChat { } private String timestampToHumanDate(Context context, String timestamp) { - SimpleDateFormat dateFormat = new SimpleDateFormat(context.getResources().getString(R.string.messages_date_format)); - Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(Long.parseLong(timestamp)); - return dateFormat.format(cal.getTime()); + try { + SimpleDateFormat dateFormat = new SimpleDateFormat(context.getResources().getString(R.string.messages_date_format)); + Calendar cal = Calendar.getInstance(); + cal.setTimeInMillis(Long.parseLong(timestamp)); + return dateFormat.format(cal.getTime()); + } catch (NumberFormatException nfe) { + return timestamp; + } + } + + private int pixelsToDpi(Context context, int pixels) { + return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, (float) pixels, context.getResources().getDisplayMetrics()); } }