diff --git a/res/drawable-xlarge-land-xhdpi/add_call_more_default.png b/res/drawable-sw600dp-land-xhdpi/add_call_more_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/add_call_more_default.png rename to res/drawable-sw600dp-land-xhdpi/add_call_more_default.png diff --git a/res/drawable-xlarge-land-xhdpi/add_call_more_disabled.png b/res/drawable-sw600dp-land-xhdpi/add_call_more_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/add_call_more_disabled.png rename to res/drawable-sw600dp-land-xhdpi/add_call_more_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/add_call_more_over.png b/res/drawable-sw600dp-land-xhdpi/add_call_more_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/add_call_more_over.png rename to res/drawable-sw600dp-land-xhdpi/add_call_more_over.png diff --git a/res/drawable-xlarge-land-xhdpi/add_contact_default.png b/res/drawable-sw600dp-land-xhdpi/add_contact_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/add_contact_default.png rename to res/drawable-sw600dp-land-xhdpi/add_contact_default.png diff --git a/res/drawable-xlarge-land-xhdpi/add_contact_disabled.png b/res/drawable-sw600dp-land-xhdpi/add_contact_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/add_contact_disabled.png rename to res/drawable-sw600dp-land-xhdpi/add_contact_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/add_contact_over.png b/res/drawable-sw600dp-land-xhdpi/add_contact_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/add_contact_over.png rename to res/drawable-sw600dp-land-xhdpi/add_contact_over.png diff --git a/res/drawable-xlarge-land-xhdpi/back_default.png b/res/drawable-sw600dp-land-xhdpi/back_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/back_default.png rename to res/drawable-sw600dp-land-xhdpi/back_default.png diff --git a/res/drawable-xlarge-land-xhdpi/back_disabled.png b/res/drawable-sw600dp-land-xhdpi/back_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/back_disabled.png rename to res/drawable-sw600dp-land-xhdpi/back_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/back_over.png b/res/drawable-sw600dp-land-xhdpi/back_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/back_over.png rename to res/drawable-sw600dp-land-xhdpi/back_over.png diff --git a/res/drawable-xlarge-land-xhdpi/background_alt.png b/res/drawable-sw600dp-land-xhdpi/background_alt.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/background_alt.png rename to res/drawable-sw600dp-land-xhdpi/background_alt.png diff --git a/res/drawable-xlarge-land-xhdpi/background_logo.png b/res/drawable-sw600dp-land-xhdpi/background_logo.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/background_logo.png rename to res/drawable-sw600dp-land-xhdpi/background_logo.png diff --git a/res/drawable-xlarge-land-xhdpi/backspace_default.png b/res/drawable-sw600dp-land-xhdpi/backspace_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/backspace_default.png rename to res/drawable-sw600dp-land-xhdpi/backspace_default.png diff --git a/res/drawable-xlarge-land-xhdpi/backspace_disabled.png b/res/drawable-sw600dp-land-xhdpi/backspace_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/backspace_disabled.png rename to res/drawable-sw600dp-land-xhdpi/backspace_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/backspace_over.png b/res/drawable-sw600dp-land-xhdpi/backspace_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/backspace_over.png rename to res/drawable-sw600dp-land-xhdpi/backspace_over.png diff --git a/res/drawable-xlarge-land-xhdpi/bottom.png b/res/drawable-sw600dp-land-xhdpi/bottom.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/bottom.png rename to res/drawable-sw600dp-land-xhdpi/bottom.png diff --git a/res/drawable-xlarge-land-xhdpi/call_default.png b/res/drawable-sw600dp-land-xhdpi/call_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/call_default.png rename to res/drawable-sw600dp-land-xhdpi/call_default.png diff --git a/res/drawable-xlarge-land-xhdpi/call_disabled.png b/res/drawable-sw600dp-land-xhdpi/call_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/call_disabled.png rename to res/drawable-sw600dp-land-xhdpi/call_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/call_over.png b/res/drawable-sw600dp-land-xhdpi/call_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/call_over.png rename to res/drawable-sw600dp-land-xhdpi/call_over.png diff --git a/res/drawable-xlarge-land-xhdpi/cancel_white_bg_default.png b/res/drawable-sw600dp-land-xhdpi/cancel_white_bg_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/cancel_white_bg_default.png rename to res/drawable-sw600dp-land-xhdpi/cancel_white_bg_default.png diff --git a/res/drawable-xlarge-land-xhdpi/cancel_white_bg_disabled.png b/res/drawable-sw600dp-land-xhdpi/cancel_white_bg_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/cancel_white_bg_disabled.png rename to res/drawable-sw600dp-land-xhdpi/cancel_white_bg_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/cancel_white_bg_over.png b/res/drawable-sw600dp-land-xhdpi/cancel_white_bg_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/cancel_white_bg_over.png rename to res/drawable-sw600dp-land-xhdpi/cancel_white_bg_over.png diff --git a/res/drawable-xlarge-land-xhdpi/chat_default.png b/res/drawable-sw600dp-land-xhdpi/chat_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/chat_default.png rename to res/drawable-sw600dp-land-xhdpi/chat_default.png diff --git a/res/drawable-xlarge-land-xhdpi/chat_over.png b/res/drawable-sw600dp-land-xhdpi/chat_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/chat_over.png rename to res/drawable-sw600dp-land-xhdpi/chat_over.png diff --git a/res/drawable-xlarge-land-xhdpi/chat_selected.png b/res/drawable-sw600dp-land-xhdpi/chat_selected.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/chat_selected.png rename to res/drawable-sw600dp-land-xhdpi/chat_selected.png diff --git a/res/drawable-xlarge-land-xhdpi/conference_default.png b/res/drawable-sw600dp-land-xhdpi/conference_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/conference_default.png rename to res/drawable-sw600dp-land-xhdpi/conference_default.png diff --git a/res/drawable-xlarge-land-xhdpi/conference_over.png b/res/drawable-sw600dp-land-xhdpi/conference_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/conference_over.png rename to res/drawable-sw600dp-land-xhdpi/conference_over.png diff --git a/res/drawable-xlarge-land-xhdpi/contacts_default.png b/res/drawable-sw600dp-land-xhdpi/contacts_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/contacts_default.png rename to res/drawable-sw600dp-land-xhdpi/contacts_default.png diff --git a/res/drawable-xlarge-land-xhdpi/contacts_over.png b/res/drawable-sw600dp-land-xhdpi/contacts_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/contacts_over.png rename to res/drawable-sw600dp-land-xhdpi/contacts_over.png diff --git a/res/drawable-xlarge-land-xhdpi/contacts_selected.png b/res/drawable-sw600dp-land-xhdpi/contacts_selected.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/contacts_selected.png rename to res/drawable-sw600dp-land-xhdpi/contacts_selected.png diff --git a/res/drawable-xlarge-land-xhdpi/dialer_address_background.png b/res/drawable-sw600dp-land-xhdpi/dialer_address_background.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/dialer_address_background.png rename to res/drawable-sw600dp-land-xhdpi/dialer_address_background.png diff --git a/res/drawable-xlarge-land-xhdpi/dialer_alt_back_default.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_back_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/dialer_alt_back_default.png rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_back_default.png diff --git a/res/drawable-xlarge-land-xhdpi/dialer_alt_back_over.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_back_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/dialer_alt_back_over.png rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_back_over.png diff --git a/res/drawable-xlarge-land-xhdpi/dialer_alt_default.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/dialer_alt_default.png rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_default.png diff --git a/res/drawable-xlarge-land-xhdpi/dialer_alt_disabled.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/dialer_alt_disabled.png rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/dialer_alt_over.png b/res/drawable-sw600dp-land-xhdpi/dialer_alt_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/dialer_alt_over.png rename to res/drawable-sw600dp-land-xhdpi/dialer_alt_over.png diff --git a/res/drawable-xlarge-land-xhdpi/dialer_default.png b/res/drawable-sw600dp-land-xhdpi/dialer_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/dialer_default.png rename to res/drawable-sw600dp-land-xhdpi/dialer_default.png diff --git a/res/drawable-xlarge-land-xhdpi/dialer_over.png b/res/drawable-sw600dp-land-xhdpi/dialer_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/dialer_over.png rename to res/drawable-sw600dp-land-xhdpi/dialer_over.png diff --git a/res/drawable-xlarge-land-xhdpi/dialer_selected.png b/res/drawable-sw600dp-land-xhdpi/dialer_selected.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/dialer_selected.png rename to res/drawable-sw600dp-land-xhdpi/dialer_selected.png diff --git a/res/drawable-xlarge-land-xhdpi/hangup_default.png b/res/drawable-sw600dp-land-xhdpi/hangup_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/hangup_default.png rename to res/drawable-sw600dp-land-xhdpi/hangup_default.png diff --git a/res/drawable-xlarge-land-xhdpi/hangup_over.png b/res/drawable-sw600dp-land-xhdpi/hangup_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/hangup_over.png rename to res/drawable-sw600dp-land-xhdpi/hangup_over.png diff --git a/res/drawable-xlarge-land-xhdpi/history_default.png b/res/drawable-sw600dp-land-xhdpi/history_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/history_default.png rename to res/drawable-sw600dp-land-xhdpi/history_default.png diff --git a/res/drawable-xlarge-land-xhdpi/history_over.png b/res/drawable-sw600dp-land-xhdpi/history_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/history_over.png rename to res/drawable-sw600dp-land-xhdpi/history_over.png diff --git a/res/drawable-xlarge-land-xhdpi/history_selected.png b/res/drawable-sw600dp-land-xhdpi/history_selected.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/history_selected.png rename to res/drawable-sw600dp-land-xhdpi/history_selected.png diff --git a/res/drawable-xlarge-land-xhdpi/mark.png b/res/drawable-sw600dp-land-xhdpi/mark.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/mark.png rename to res/drawable-sw600dp-land-xhdpi/mark.png diff --git a/res/drawable-xlarge-land-xhdpi/micro_off_default.png b/res/drawable-sw600dp-land-xhdpi/micro_off_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/micro_off_default.png rename to res/drawable-sw600dp-land-xhdpi/micro_off_default.png diff --git a/res/drawable-xlarge-land-xhdpi/micro_off_disabled.png b/res/drawable-sw600dp-land-xhdpi/micro_off_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/micro_off_disabled.png rename to res/drawable-sw600dp-land-xhdpi/micro_off_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/micro_off_over.png b/res/drawable-sw600dp-land-xhdpi/micro_off_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/micro_off_over.png rename to res/drawable-sw600dp-land-xhdpi/micro_off_over.png diff --git a/res/drawable-xlarge-land-xhdpi/micro_on_default.png b/res/drawable-sw600dp-land-xhdpi/micro_on_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/micro_on_default.png rename to res/drawable-sw600dp-land-xhdpi/micro_on_default.png diff --git a/res/drawable-xlarge-land-xhdpi/micro_on_disabled.png b/res/drawable-sw600dp-land-xhdpi/micro_on_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/micro_on_disabled.png rename to res/drawable-sw600dp-land-xhdpi/micro_on_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/micro_on_over.png b/res/drawable-sw600dp-land-xhdpi/micro_on_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/micro_on_over.png rename to res/drawable-sw600dp-land-xhdpi/micro_on_over.png diff --git a/res/drawable-xlarge-land-xhdpi/options_add_default.png b/res/drawable-sw600dp-land-xhdpi/options_add_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_add_default.png rename to res/drawable-sw600dp-land-xhdpi/options_add_default.png diff --git a/res/drawable-xlarge-land-xhdpi/options_add_default_alt.png b/res/drawable-sw600dp-land-xhdpi/options_add_default_alt.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_add_default_alt.png rename to res/drawable-sw600dp-land-xhdpi/options_add_default_alt.png diff --git a/res/drawable-xlarge-land-xhdpi/options_add_disabled.png b/res/drawable-sw600dp-land-xhdpi/options_add_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_add_disabled.png rename to res/drawable-sw600dp-land-xhdpi/options_add_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/options_add_disabled_alt.png b/res/drawable-sw600dp-land-xhdpi/options_add_disabled_alt.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_add_disabled_alt.png rename to res/drawable-sw600dp-land-xhdpi/options_add_disabled_alt.png diff --git a/res/drawable-xlarge-land-xhdpi/options_add_over.png b/res/drawable-sw600dp-land-xhdpi/options_add_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_add_over.png rename to res/drawable-sw600dp-land-xhdpi/options_add_over.png diff --git a/res/drawable-xlarge-land-xhdpi/options_add_over_alt.png b/res/drawable-sw600dp-land-xhdpi/options_add_over_alt.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_add_over_alt.png rename to res/drawable-sw600dp-land-xhdpi/options_add_over_alt.png diff --git a/res/drawable-xlarge-land-xhdpi/options_default.png b/res/drawable-sw600dp-land-xhdpi/options_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_default.png rename to res/drawable-sw600dp-land-xhdpi/options_default.png diff --git a/res/drawable-xlarge-land-xhdpi/options_default_alt.png b/res/drawable-sw600dp-land-xhdpi/options_default_alt.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_default_alt.png rename to res/drawable-sw600dp-land-xhdpi/options_default_alt.png diff --git a/res/drawable-xlarge-land-xhdpi/options_disabled.png b/res/drawable-sw600dp-land-xhdpi/options_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_disabled.png rename to res/drawable-sw600dp-land-xhdpi/options_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/options_disabled_alt.png b/res/drawable-sw600dp-land-xhdpi/options_disabled_alt.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_disabled_alt.png rename to res/drawable-sw600dp-land-xhdpi/options_disabled_alt.png diff --git a/res/drawable-xlarge-land-xhdpi/options_over.png b/res/drawable-sw600dp-land-xhdpi/options_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_over.png rename to res/drawable-sw600dp-land-xhdpi/options_over.png diff --git a/res/drawable-xlarge-land-xhdpi/options_over_alt.png b/res/drawable-sw600dp-land-xhdpi/options_over_alt.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_over_alt.png rename to res/drawable-sw600dp-land-xhdpi/options_over_alt.png diff --git a/res/drawable-xlarge-land-xhdpi/options_selected.png b/res/drawable-sw600dp-land-xhdpi/options_selected.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_selected.png rename to res/drawable-sw600dp-land-xhdpi/options_selected.png diff --git a/res/drawable-xlarge-land-xhdpi/options_selected_alt.png b/res/drawable-sw600dp-land-xhdpi/options_selected_alt.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_selected_alt.png rename to res/drawable-sw600dp-land-xhdpi/options_selected_alt.png diff --git a/res/drawable-xlarge-land-xhdpi/options_transfer_default.png b/res/drawable-sw600dp-land-xhdpi/options_transfer_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_transfer_default.png rename to res/drawable-sw600dp-land-xhdpi/options_transfer_default.png diff --git a/res/drawable-xlarge-land-xhdpi/options_transfer_disabled.png b/res/drawable-sw600dp-land-xhdpi/options_transfer_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_transfer_disabled.png rename to res/drawable-sw600dp-land-xhdpi/options_transfer_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/options_transfer_over.png b/res/drawable-sw600dp-land-xhdpi/options_transfer_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/options_transfer_over.png rename to res/drawable-sw600dp-land-xhdpi/options_transfer_over.png diff --git a/res/drawable-xlarge-land-xhdpi/pause_off_default.png b/res/drawable-sw600dp-land-xhdpi/pause_off_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/pause_off_default.png rename to res/drawable-sw600dp-land-xhdpi/pause_off_default.png diff --git a/res/drawable-xlarge-land-xhdpi/pause_off_disabled.png b/res/drawable-sw600dp-land-xhdpi/pause_off_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/pause_off_disabled.png rename to res/drawable-sw600dp-land-xhdpi/pause_off_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/pause_off_over.png b/res/drawable-sw600dp-land-xhdpi/pause_off_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/pause_off_over.png rename to res/drawable-sw600dp-land-xhdpi/pause_off_over.png diff --git a/res/drawable-xlarge-land-xhdpi/pause_on_default.png b/res/drawable-sw600dp-land-xhdpi/pause_on_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/pause_on_default.png rename to res/drawable-sw600dp-land-xhdpi/pause_on_default.png diff --git a/res/drawable-xlarge-land-xhdpi/pause_on_over.png b/res/drawable-sw600dp-land-xhdpi/pause_on_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/pause_on_over.png rename to res/drawable-sw600dp-land-xhdpi/pause_on_over.png diff --git a/res/drawable-xlarge-land-xhdpi/settings_default.png b/res/drawable-sw600dp-land-xhdpi/settings_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/settings_default.png rename to res/drawable-sw600dp-land-xhdpi/settings_default.png diff --git a/res/drawable-xlarge-land-xhdpi/settings_over.png b/res/drawable-sw600dp-land-xhdpi/settings_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/settings_over.png rename to res/drawable-sw600dp-land-xhdpi/settings_over.png diff --git a/res/drawable-xlarge-land-xhdpi/settings_selected.png b/res/drawable-sw600dp-land-xhdpi/settings_selected.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/settings_selected.png rename to res/drawable-sw600dp-land-xhdpi/settings_selected.png diff --git a/res/drawable-xlarge-land-xhdpi/setup_back_default.png b/res/drawable-sw600dp-land-xhdpi/setup_back_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/setup_back_default.png rename to res/drawable-sw600dp-land-xhdpi/setup_back_default.png diff --git a/res/drawable-xlarge-land-xhdpi/setup_back_disabled.png b/res/drawable-sw600dp-land-xhdpi/setup_back_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/setup_back_disabled.png rename to res/drawable-sw600dp-land-xhdpi/setup_back_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/setup_back_over.png b/res/drawable-sw600dp-land-xhdpi/setup_back_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/setup_back_over.png rename to res/drawable-sw600dp-land-xhdpi/setup_back_over.png diff --git a/res/drawable-xlarge-land-xhdpi/setup_cancel_default.png b/res/drawable-sw600dp-land-xhdpi/setup_cancel_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/setup_cancel_default.png rename to res/drawable-sw600dp-land-xhdpi/setup_cancel_default.png diff --git a/res/drawable-xlarge-land-xhdpi/setup_cancel_disabled.png b/res/drawable-sw600dp-land-xhdpi/setup_cancel_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/setup_cancel_disabled.png rename to res/drawable-sw600dp-land-xhdpi/setup_cancel_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/setup_cancel_over_.png b/res/drawable-sw600dp-land-xhdpi/setup_cancel_over_.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/setup_cancel_over_.png rename to res/drawable-sw600dp-land-xhdpi/setup_cancel_over_.png diff --git a/res/drawable-xlarge-land-xhdpi/setup_start_default.png b/res/drawable-sw600dp-land-xhdpi/setup_start_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/setup_start_default.png rename to res/drawable-sw600dp-land-xhdpi/setup_start_default.png diff --git a/res/drawable-xlarge-land-xhdpi/setup_start_disabled.png b/res/drawable-sw600dp-land-xhdpi/setup_start_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/setup_start_disabled.png rename to res/drawable-sw600dp-land-xhdpi/setup_start_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/setup_start_over.png b/res/drawable-sw600dp-land-xhdpi/setup_start_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/setup_start_over.png rename to res/drawable-sw600dp-land-xhdpi/setup_start_over.png diff --git a/res/drawable-xlarge-land-xhdpi/speaker_off_default.png b/res/drawable-sw600dp-land-xhdpi/speaker_off_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/speaker_off_default.png rename to res/drawable-sw600dp-land-xhdpi/speaker_off_default.png diff --git a/res/drawable-xlarge-land-xhdpi/speaker_off_disabled.png b/res/drawable-sw600dp-land-xhdpi/speaker_off_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/speaker_off_disabled.png rename to res/drawable-sw600dp-land-xhdpi/speaker_off_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/speaker_off_over.png b/res/drawable-sw600dp-land-xhdpi/speaker_off_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/speaker_off_over.png rename to res/drawable-sw600dp-land-xhdpi/speaker_off_over.png diff --git a/res/drawable-xlarge-land-xhdpi/speaker_on_default.png b/res/drawable-sw600dp-land-xhdpi/speaker_on_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/speaker_on_default.png rename to res/drawable-sw600dp-land-xhdpi/speaker_on_default.png diff --git a/res/drawable-xlarge-land-xhdpi/speaker_on_disabled.png b/res/drawable-sw600dp-land-xhdpi/speaker_on_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/speaker_on_disabled.png rename to res/drawable-sw600dp-land-xhdpi/speaker_on_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/speaker_on_over.png b/res/drawable-sw600dp-land-xhdpi/speaker_on_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/speaker_on_over.png rename to res/drawable-sw600dp-land-xhdpi/speaker_on_over.png diff --git a/res/drawable-xlarge-land-xhdpi/splashscreen.png b/res/drawable-sw600dp-land-xhdpi/splashscreen.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/splashscreen.png rename to res/drawable-sw600dp-land-xhdpi/splashscreen.png diff --git a/res/drawable-xlarge-land-xhdpi/statebar_background.png b/res/drawable-sw600dp-land-xhdpi/statebar_background.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/statebar_background.png rename to res/drawable-sw600dp-land-xhdpi/statebar_background.png diff --git a/res/drawable-xlarge-land-xhdpi/unknown_small.png b/res/drawable-sw600dp-land-xhdpi/unknown_small.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/unknown_small.png rename to res/drawable-sw600dp-land-xhdpi/unknown_small.png diff --git a/res/drawable-xlarge-land-xhdpi/video_off_default.png b/res/drawable-sw600dp-land-xhdpi/video_off_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/video_off_default.png rename to res/drawable-sw600dp-land-xhdpi/video_off_default.png diff --git a/res/drawable-xlarge-land-xhdpi/video_off_disabled.png b/res/drawable-sw600dp-land-xhdpi/video_off_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/video_off_disabled.png rename to res/drawable-sw600dp-land-xhdpi/video_off_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/video_off_over.png b/res/drawable-sw600dp-land-xhdpi/video_off_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/video_off_over.png rename to res/drawable-sw600dp-land-xhdpi/video_off_over.png diff --git a/res/drawable-xlarge-land-xhdpi/video_on_default.png b/res/drawable-sw600dp-land-xhdpi/video_on_default.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/video_on_default.png rename to res/drawable-sw600dp-land-xhdpi/video_on_default.png diff --git a/res/drawable-xlarge-land-xhdpi/video_on_disabled.png b/res/drawable-sw600dp-land-xhdpi/video_on_disabled.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/video_on_disabled.png rename to res/drawable-sw600dp-land-xhdpi/video_on_disabled.png diff --git a/res/drawable-xlarge-land-xhdpi/video_on_over.png b/res/drawable-sw600dp-land-xhdpi/video_on_over.png similarity index 100% rename from res/drawable-xlarge-land-xhdpi/video_on_over.png rename to res/drawable-sw600dp-land-xhdpi/video_on_over.png diff --git a/res/layout-xlarge-land/avatar.xml b/res/layout-sw600dp-land/avatar.xml similarity index 100% rename from res/layout-xlarge-land/avatar.xml rename to res/layout-sw600dp-land/avatar.xml diff --git a/res/layout-xlarge-land/contact.xml b/res/layout-sw600dp-land/contact.xml similarity index 100% rename from res/layout-xlarge-land/contact.xml rename to res/layout-sw600dp-land/contact.xml diff --git a/res/layout-xlarge-land/dialer.xml b/res/layout-sw600dp-land/dialer.xml similarity index 100% rename from res/layout-xlarge-land/dialer.xml rename to res/layout-sw600dp-land/dialer.xml diff --git a/res/layout-xlarge-land/incall.xml b/res/layout-sw600dp-land/incall.xml similarity index 100% rename from res/layout-xlarge-land/incall.xml rename to res/layout-sw600dp-land/incall.xml diff --git a/res/layout-xlarge-land/main.xml b/res/layout-sw600dp-land/main.xml similarity index 100% rename from res/layout-xlarge-land/main.xml rename to res/layout-sw600dp-land/main.xml diff --git a/res/layout-xlarge-land/menu_about_chat_button.xml b/res/layout-sw600dp-land/menu_about_chat_button.xml similarity index 100% rename from res/layout-xlarge-land/menu_about_chat_button.xml rename to res/layout-sw600dp-land/menu_about_chat_button.xml diff --git a/res/layout-xlarge-land/menu_about_settings_button.xml b/res/layout-sw600dp-land/menu_about_settings_button.xml similarity index 100% rename from res/layout-xlarge-land/menu_about_settings_button.xml rename to res/layout-sw600dp-land/menu_about_settings_button.xml diff --git a/res/layout-xlarge-land/menu_chat_button.xml b/res/layout-sw600dp-land/menu_chat_button.xml similarity index 100% rename from res/layout-xlarge-land/menu_chat_button.xml rename to res/layout-sw600dp-land/menu_chat_button.xml diff --git a/res/layout-xlarge-land/menu_contact_button.xml b/res/layout-sw600dp-land/menu_contact_button.xml similarity index 100% rename from res/layout-xlarge-land/menu_contact_button.xml rename to res/layout-sw600dp-land/menu_contact_button.xml diff --git a/res/layout-xlarge-land/menu_history_button.xml b/res/layout-sw600dp-land/menu_history_button.xml similarity index 100% rename from res/layout-xlarge-land/menu_history_button.xml rename to res/layout-sw600dp-land/menu_history_button.xml diff --git a/res/layout-xlarge-land/menu_settings_button.xml b/res/layout-sw600dp-land/menu_settings_button.xml similarity index 100% rename from res/layout-xlarge-land/menu_settings_button.xml rename to res/layout-sw600dp-land/menu_settings_button.xml diff --git a/res/layout-xlarge-land/settings.xml b/res/layout-sw600dp-land/settings.xml similarity index 100% rename from res/layout-xlarge-land/settings.xml rename to res/layout-sw600dp-land/settings.xml diff --git a/res/layout-xlarge-land/setup_back_button.xml b/res/layout-sw600dp-land/setup_back_button.xml similarity index 100% rename from res/layout-xlarge-land/setup_back_button.xml rename to res/layout-sw600dp-land/setup_back_button.xml diff --git a/res/layout-xlarge-land/setup_cancel_button.xml b/res/layout-sw600dp-land/setup_cancel_button.xml similarity index 100% rename from res/layout-xlarge-land/setup_cancel_button.xml rename to res/layout-sw600dp-land/setup_cancel_button.xml diff --git a/res/layout-xlarge-land/setup_next_button.xml b/res/layout-sw600dp-land/setup_next_button.xml similarity index 100% rename from res/layout-xlarge-land/setup_next_button.xml rename to res/layout-sw600dp-land/setup_next_button.xml diff --git a/res/raw-xlarge/linphonerc b/res/raw-sw600dp/linphonerc similarity index 100% rename from res/raw-xlarge/linphonerc rename to res/raw-sw600dp/linphonerc diff --git a/res/values-sw600dp/non_localizable_strings.xml b/res/values-sw600dp/non_localizable_strings.xml new file mode 100644 index 000000000..975f4a5b7 --- /dev/null +++ b/res/values-sw600dp/non_localizable_strings.xml @@ -0,0 +1,4 @@ + + + true + \ No newline at end of file diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml index a1514a800..ab2694606 100644 --- a/res/values/non_localizable_strings.xml +++ b/res/values/non_localizable_strings.xml @@ -1,6 +1,7 @@ + false pref_disable_account_key pref_nb_accounts_extra diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 47bd00c49..2e547f6aa 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -45,7 +45,6 @@ import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneFriend; import org.linphone.core.Log; import org.linphone.core.OnlineStatus; -import org.linphone.mediastream.Version; import org.linphone.setup.SetupActivity; import org.linphone.ui.AddressText; @@ -204,9 +203,13 @@ public class LinphoneActivity extends FragmentActivity implements missedCalls = (TextView) findViewById(R.id.missedCalls); missedChats = (TextView) findViewById(R.id.missedChats); } + + private boolean isTablet() { + return getResources().getBoolean(R.bool.isTablet); + } private void hideStatusBar() { - if (Version.isXLargeScreen(this)) { + if (isTablet()) { return; } @@ -215,7 +218,7 @@ public class LinphoneActivity extends FragmentActivity implements } private void showStatusBar() { - if (Version.isXLargeScreen(this)) { + if (isTablet()) { return; } @@ -299,7 +302,7 @@ public class LinphoneActivity extends FragmentActivity implements if (newFragment != null) { newFragment.setArguments(extras); - if (Version.isXLargeScreen(this)) { + if (isTablet()) { changeFragmentForTablets(newFragment, newFragmentType, withoutAnimation); } else { changeFragment(newFragment, newFragmentType, withoutAnimation); @@ -1337,7 +1340,7 @@ public class LinphoneActivity extends FragmentActivity implements return true; } } else { - if (Version.isXLargeScreen(this)) { + if (isTablet()) { return true; } diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/org/linphone/LinphoneLauncherActivity.java index e3186e17f..1b8b32704 100644 --- a/src/org/linphone/LinphoneLauncherActivity.java +++ b/src/org/linphone/LinphoneLauncherActivity.java @@ -21,7 +21,6 @@ package org.linphone; import static android.content.Intent.ACTION_MAIN; import org.linphone.compatibility.Compatibility; -import org.linphone.mediastream.Version; import android.app.Activity; import android.content.Intent; @@ -46,7 +45,7 @@ public class LinphoneLauncherActivity extends Activity { super.onCreate(savedInstanceState); // Hack to avoid to draw twice LinphoneActivity on tablets - if (Version.isXLargeScreen(this)) { + if (getResources().getBoolean(R.bool.isTablet)) { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); } else { setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);