Refactoring on drawables' names

2012-07-03 13:41:39 +02:00 · 2012-07-03 13:41:39 +02:00 · 4883c016a2
commit 4883c016a2
parent f8596abb55
157 changed files with 131 additions and 110 deletions
--- a/res/drawable/add_call.xml
+++ b/res/drawable/add_call.xml
@ -3,5 +3,5 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/add_call_over" />
    <item
-         android:drawable="@drawable/add_call_actif" />
+         android:drawable="@drawable/add_call_default" />
 </selector>
--- a/res/drawable/add_call_default.png
+++ b/res/drawable/add_call_default.png
--- a/res/drawable/add_contact.xml
+++ b/res/drawable/add_contact.xml
@ -3,8 +3,8 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/add_contact_over" />
    <item android:state_enabled="false"
-        android:drawable="@drawable/add_contact_inactif" />
+        android:drawable="@drawable/add_contact_disabled" />
    <item
-         android:drawable="@drawable/add_contact_actif" />
+         android:drawable="@drawable/add_contact_default" />
 </selector>

--- a/res/drawable/add_contact_default.png
+++ b/res/drawable/add_contact_default.png
--- a/res/drawable/add_contact_disabled.png
+++ b/res/drawable/add_contact_disabled.png
--- a/res/drawable/all_contacts.xml
+++ b/res/drawable/all_contacts.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="true" 
-        android:drawable="@drawable/all_selectionne" />
+        android:drawable="@drawable/all_selected" />
    <item android:state_enabled="false"
-         android:drawable="@drawable/all_actif" />
+         android:drawable="@drawable/all_default" />
 </selector>

--- a/res/drawable/all_default.png
+++ b/res/drawable/all_default.png
--- a/res/drawable/all_selectionne.png
+++ b/res/drawable/all_selectionne.png
--- a/res/drawable/backspace.xml
+++ b/res/drawable/backspace.xml
@ -3,6 +3,6 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/backspace_over" />
    <item
-         android:drawable="@drawable/backspace_actif" />
+         android:drawable="@drawable/backspace_default" />
 </selector>

--- a/res/drawable/backspace_default.png
+++ b/res/drawable/backspace_default.png
--- a/res/drawable/barre_noire_top.png
+++ b/res/drawable/barre_noire_top.png
--- a/res/drawable/button.xml
+++ b/res/drawable/button.xml
@ -3,5 +3,5 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/button_background_over" />
    <item
-         android:drawable="@drawable/button_background_actif" />
+         android:drawable="@drawable/button_background_default" />
 </selector>
--- a/res/drawable/button_background_default.png
+++ b/res/drawable/button_background_default.png
--- a/res/drawable/call.xml
+++ b/res/drawable/call.xml
@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true" 
-        android:drawable="@drawable/call_answer_over" />
+        android:drawable="@drawable/call_over" />
    <item
-         android:drawable="@drawable/call_answer_default" />
+         android:drawable="@drawable/call_default" />
 </selector>
+
--- a/res/drawable/call_answer.xml
+++ b/res/drawable/call_answer.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true" 
-        android:drawable="@drawable/detail_over" />
+        android:drawable="@drawable/call_answer_over" />
    <item
-         android:drawable="@drawable/detail_actif" />
+         android:drawable="@drawable/call_answer_default" />
 </selector>
--- a/res/drawable/appeler_actif.png
+++ b/res/drawable/appeler_actif.png
--- a/res/drawable/appeler_over.png
+++ b/res/drawable/appeler_over.png
--- a/res/drawable/call_quality_indicator_0.png
+++ b/res/drawable/call_quality_indicator_0.png
--- a/res/drawable/call_quality_indicator_1.png
+++ b/res/drawable/call_quality_indicator_1.png
--- a/res/drawable/call_quality_indicator_2.png
+++ b/res/drawable/call_quality_indicator_2.png
--- a/res/drawable/call_quality_indicator_3.png
+++ b/res/drawable/call_quality_indicator_3.png
--- a/res/drawable/call_status_incoming.png
+++ b/res/drawable/call_status_incoming.png
--- a/res/drawable/call_status_missed.png
+++ b/res/drawable/call_status_missed.png
--- a/res/drawable/call_status_outgoing.png
+++ b/res/drawable/call_status_outgoing.png
--- a/res/drawable/cancel_white_bg_default.png
+++ b/res/drawable/cancel_white_bg_default.png
--- a/res/drawable/cancel_white_bg_disabled.png
+++ b/res/drawable/cancel_white_bg_disabled.png
--- a/res/drawable/cancel_white_bg_over.png
+++ b/res/drawable/cancel_white_bg_over.png
--- a/res/drawable/chat.xml
+++ b/res/drawable/chat.xml
@ -3,7 +3,7 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/chat_over" />
    <item android:state_selected="true"
-        android:drawable="@drawable/chat_selectionne" />
+        android:drawable="@drawable/chat_selected" />
    <item
-         android:drawable="@drawable/chat_actif" />
+         android:drawable="@drawable/chat_default" />
 </selector>
--- a/res/drawable/chat_bubble_incoming.9.png
+++ b/res/drawable/chat_bubble_incoming.9.png
--- a/res/drawable/chat_bubble_outgoing.9.png
+++ b/res/drawable/chat_bubble_outgoing.9.png
--- a/res/drawable/chat_default.png
+++ b/res/drawable/chat_default.png
--- a/res/drawable/chat_edit.xml
+++ b/res/drawable/chat_edit.xml
@ -3,6 +3,6 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/chat_edit_over" />
    <item
-         android:drawable="@drawable/chat_edit_actif" />
+         android:drawable="@drawable/chat_edit_default" />
 </selector>

--- a/res/drawable/chat_edit_default.png
+++ b/res/drawable/chat_edit_default.png
--- a/res/drawable/chat_new.xml
+++ b/res/drawable/chat_new.xml
@ -3,6 +3,6 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/chat_new_over" />
    <item
-         android:drawable="@drawable/chat_new_actif" />
+         android:drawable="@drawable/chat_new_default" />
 </selector>

--- a/res/drawable/chat_new_default.png
+++ b/res/drawable/chat_new_default.png
--- a/res/drawable/chat_ok.xml
+++ b/res/drawable/chat_ok.xml
@ -3,6 +3,6 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/chat_ok_over" />
    <item
-         android:drawable="@drawable/chat_ok_actif" />
+         android:drawable="@drawable/chat_ok_default" />
 </selector>

--- a/res/drawable/chat_ok_default.png
+++ b/res/drawable/chat_ok_default.png
--- a/res/drawable/chat_selectionne.png
+++ b/res/drawable/chat_selectionne.png
--- a/res/drawable/chat_send_message.xml
+++ b/res/drawable/chat_send_message.xml
@ -3,6 +3,6 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/chat_send_message_over" />
    <item
-         android:drawable="@drawable/chat_send_message_actif" />
+         android:drawable="@drawable/chat_send_message_default" />
 </selector>

--- a/res/drawable/chat_send_message_default.png
+++ b/res/drawable/chat_send_message_default.png
--- a/res/drawable/contacts.xml
+++ b/res/drawable/contacts.xml
@ -3,7 +3,7 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/contacts_over" />
    <item android:state_selected="true"
-        android:drawable="@drawable/contacts_selectionne" />
+        android:drawable="@drawable/contacts_selected" />
    <item
-         android:drawable="@drawable/contacts_actif" />
+         android:drawable="@drawable/contacts_default" />
 </selector>
--- a/res/drawable/contacts_default.png
+++ b/res/drawable/contacts_default.png
--- a/res/drawable/contacts_selectionne.png
+++ b/res/drawable/contacts_selectionne.png
--- a/res/drawable/delete.xml
+++ b/res/drawable/delete.xml
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/delete_over" />
-    <item
-         android:drawable="@drawable/delete_actif" />
-</selector>
--- a/res/drawable/dialer.xml
+++ b/res/drawable/dialer.xml
@ -3,7 +3,7 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/dialer_over" />
    <item android:state_selected="true"
-        android:drawable="@drawable/dialer_selectionne" />
+        android:drawable="@drawable/dialer_selected" />
    <item
-         android:drawable="@drawable/dialer_actif" />
+         android:drawable="@drawable/dialer_default" />
 </selector>
--- a/res/drawable/dialer_address_background.png
+++ b/res/drawable/dialer_address_background.png
--- a/res/drawable/dialer_alt.xml
+++ b/res/drawable/dialer_alt.xml
@ -3,6 +3,6 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/dialer_alt_over" />
    <item
-         android:drawable="@drawable/dialer_alt_actif" />
+         android:drawable="@drawable/dialer_alt_default" />
 </selector>

--- a/res/drawable/dialer_alt_default.png
+++ b/res/drawable/dialer_alt_default.png
--- a/res/drawable/dialer_default.png
+++ b/res/drawable/dialer_default.png
--- a/res/drawable/dialer_over.png
+++ b/res/drawable/dialer_over.png
--- a/res/drawable/dialer_selectionne.png
+++ b/res/drawable/dialer_selectionne.png
--- a/res/drawable/hangup.xml
+++ b/res/drawable/hangup.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true" 
-        android:drawable="@drawable/edit_over" />
+        android:drawable="@drawable/hangup_over" />
    <item
-         android:drawable="@drawable/edit_actif" />
+         android:drawable="@drawable/hangup_default" />
 </selector>

--- a/res/drawable/raccrocher_actif.png
+++ b/res/drawable/raccrocher_actif.png
--- a/res/drawable/raccrocher_over.png
+++ b/res/drawable/raccrocher_over.png
--- a/res/drawable/history.xml
+++ b/res/drawable/history.xml
@ -3,7 +3,7 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/history_over" />
    <item android:state_selected="true"
-        android:drawable="@drawable/history_selectionne" />
+        android:drawable="@drawable/history_selected" />
    <item
-         android:drawable="@drawable/history_actif" />
+         android:drawable="@drawable/history_default" />
 </selector>
--- a/res/drawable/history_all.xml
+++ b/res/drawable/history_all.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="true" 
-        android:drawable="@drawable/all_call_selectionne" />
+        android:drawable="@drawable/history_all_selected" />
    <item android:state_enabled="false"
-         android:drawable="@drawable/all_call_actif" />
+         android:drawable="@drawable/history_all_default" />
 </selector>

--- a/res/drawable/history_all_default.png
+++ b/res/drawable/history_all_default.png
--- a/res/drawable/history_all_selected.png
+++ b/res/drawable/history_all_selected.png
--- a/res/drawable/history_default.png
+++ b/res/drawable/history_default.png
--- a/res/drawable/history_edit.xml
+++ b/res/drawable/history_edit.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/history_edit_over" />
+    <item
+         android:drawable="@drawable/history_edit_default" />
+</selector>
+
--- a/res/drawable/history_edit_default.png
+++ b/res/drawable/history_edit_default.png
--- a/res/drawable/history_edit_over.png
+++ b/res/drawable/history_edit_over.png
--- a/res/drawable/history_missed.xml
+++ b/res/drawable/history_missed.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="true" 
-        android:drawable="@drawable/missed_selectionne" />
+        android:drawable="@drawable/history_missed_selected" />
    <item android:state_enabled="false"
-         android:drawable="@drawable/missed_actif" />
+         android:drawable="@drawable/history_missed_default" />
 </selector>
--- a/res/drawable/history_missed_default.png
+++ b/res/drawable/history_missed_default.png
--- a/res/drawable/history_missed_selected.png
+++ b/res/drawable/history_missed_selected.png
--- a/res/drawable/history_selectionne.png
+++ b/res/drawable/history_selectionne.png
--- a/res/drawable/led_connected.png
+++ b/res/drawable/led_connected.png
--- a/res/drawable/led_disconnected.png
+++ b/res/drawable/led_disconnected.png
--- a/res/drawable/not_connected_led.png
+++ b/res/drawable/not_connected_led.png
--- a/res/drawable/led_inprogress.png
+++ b/res/drawable/led_inprogress.png
--- a/res/drawable/linphone_contacts.xml
+++ b/res/drawable/linphone_contacts.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_enabled="true" 
-        android:drawable="@drawable/linphone_selectionne" />
+        android:drawable="@drawable/linphone_selected" />
    <item android:state_enabled="false"
-         android:drawable="@drawable/linphone_actif" />
+         android:drawable="@drawable/linphone_default" />
 </selector>
--- a/res/drawable/linphone_default.png
+++ b/res/drawable/linphone_default.png
--- a/res/drawable/linphone_selectionne.png
+++ b/res/drawable/linphone_selectionne.png
--- a/res/drawable/list_delete.xml
+++ b/res/drawable/list_delete.xml
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
    <item android:state_pressed="true" 
-        android:drawable="@drawable/play_over" />
+        android:drawable="@drawable/list_delete_over" />
    <item
-         android:drawable="@drawable/play_actif" />
+         android:drawable="@drawable/list_delete_default" />
 </selector>
-
--- a/res/drawable/list_delete_default.png
+++ b/res/drawable/list_delete_default.png
--- a/res/drawable/list_delete_over.png
+++ b/res/drawable/list_delete_over.png
--- a/res/drawable/list_detail.xml
+++ b/res/drawable/list_detail.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/list_detail_over" />
+    <item
+         android:drawable="@drawable/list_detail_default" />
+</selector>
--- a/res/drawable/list_detail_default.png
+++ b/res/drawable/list_detail_default.png
--- a/res/drawable/list_detail_over.png
+++ b/res/drawable/list_detail_over.png
--- a/res/drawable/micro_off.xml
+++ b/res/drawable/micro_off.xml
@ -3,5 +3,5 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/micro_off_over" />
    <item
-         android:drawable="@drawable/micro_off_actif" />
+         android:drawable="@drawable/micro_off_default" />
 </selector>
--- a/res/drawable/micro_off_default.png
+++ b/res/drawable/micro_off_default.png
--- a/res/drawable/micro_on.xml
+++ b/res/drawable/micro_on.xml
@ -3,5 +3,5 @@
    <item android:state_pressed="true" 
        android:drawable="@drawable/micro_on_over" />
    <item
-         android:drawable="@drawable/micro_on_actif" />
+         android:drawable="@drawable/micro_on_default" />
 </selector>
--- a/res/drawable/micro_on_default.png
+++ b/res/drawable/micro_on_default.png
--- a/res/drawable/new_contact.xml
+++ b/res/drawable/new_contact.xml
@ -5,5 +5,5 @@
    <item android:state_enabled="false" 
        android:drawable="@drawable/new_contact_over" />
    <item
-         android:drawable="@drawable/new_contact_actif" />
+         android:drawable="@drawable/new_contact_default" />
 </selector>
--- a/res/drawable/new_contact_default.png
+++ b/res/drawable/new_contact_default.png
--- a/res/drawable/numpad_eight_actif.png
+++ b/res/drawable/numpad_eight_actif.png
--- a/res/drawable/numpad_eight_over.png
+++ b/res/drawable/numpad_eight_over.png
--- a/res/drawable/numpad_five_actif.png
+++ b/res/drawable/numpad_five_actif.png
--- a/res/drawable/numpad_five_over.png
+++ b/res/drawable/numpad_five_over.png
--- a/res/drawable/numpad_four_actif.png
+++ b/res/drawable/numpad_four_actif.png
--- a/res/drawable/numpad_four_over.png
+++ b/res/drawable/numpad_four_over.png
--- a/res/drawable/numpad_nine_actif.png
+++ b/res/drawable/numpad_nine_actif.png
--- a/res/drawable/numpad_nine_over.png
+++ b/res/drawable/numpad_nine_over.png
--- a/res/drawable/numpad_one_actif.png
+++ b/res/drawable/numpad_one_actif.png
--- a/res/drawable/numpad_one_over.png
+++ b/res/drawable/numpad_one_over.png
--- a/res/drawable/numpad_seven_actif.png
+++ b/res/drawable/numpad_seven_actif.png
--- a/res/drawable/numpad_seven_over.png
+++ b/res/drawable/numpad_seven_over.png
--- a/res/drawable/numpad_sharp_actif.png
+++ b/res/drawable/numpad_sharp_actif.png
--- a/res/drawable/numpad_sharp_over.png
+++ b/res/drawable/numpad_sharp_over.png
--- a/res/drawable/numpad_six_actif.png
+++ b/res/drawable/numpad_six_actif.png
--- a/Show more
+++ b/Show more