From 732dc9ddfc51c628c0453608f56b9f44e9fe5708 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 12 Nov 2012 11:59:18 +0100 Subject: [PATCH] Improved tablet version for some devices --- AndroidManifest.xml | 2 +- .../add_call_more_default.png | Bin .../add_call_more_disabled.png | Bin .../add_call_more_over.png | Bin .../add_contact_default.png | Bin .../add_contact_disabled.png | Bin .../add_contact_over.png | Bin .../back_default.png | Bin .../back_disabled.png | Bin .../back_over.png | Bin .../background_alt.png | Bin .../background_logo.png | Bin .../backspace_default.png | Bin .../backspace_disabled.png | Bin .../backspace_over.png | Bin .../bottom.png | Bin .../call_default.png | Bin .../call_disabled.png | Bin .../call_over.png | Bin .../cancel_white_bg_default.png | Bin .../cancel_white_bg_disabled.png | Bin .../cancel_white_bg_over.png | Bin .../chat_default.png | Bin .../chat_over.png | Bin .../chat_selected.png | Bin .../conference_default.png | Bin .../conference_over.png | Bin .../contacts_default.png | Bin .../contacts_over.png | Bin .../contacts_selected.png | Bin .../dialer_address_background.png | Bin .../dialer_alt_back_default.png | Bin .../dialer_alt_back_over.png | Bin .../dialer_alt_default.png | Bin .../dialer_alt_disabled.png | Bin .../dialer_alt_over.png | Bin .../dialer_default.png | Bin .../dialer_over.png | Bin .../dialer_selected.png | Bin .../hangup_default.png | Bin .../hangup_over.png | Bin .../history_default.png | Bin .../history_over.png | Bin .../history_selected.png | Bin .../mark.png | Bin .../micro_off_default.png | Bin .../micro_off_disabled.png | Bin .../micro_off_over.png | Bin .../micro_on_default.png | Bin .../micro_on_disabled.png | Bin .../micro_on_over.png | Bin .../options_add_default.png | Bin .../options_add_default_alt.png | Bin .../options_add_disabled.png | Bin .../options_add_disabled_alt.png | Bin .../options_add_over.png | Bin .../options_add_over_alt.png | Bin .../options_default.png | Bin .../options_default_alt.png | Bin .../options_disabled.png | Bin .../options_disabled_alt.png | Bin .../options_over.png | Bin .../options_over_alt.png | Bin .../options_selected.png | Bin .../options_selected_alt.png | Bin .../options_transfer_default.png | Bin .../options_transfer_disabled.png | Bin .../options_transfer_over.png | Bin .../pause_off_default.png | Bin .../pause_off_disabled.png | Bin .../pause_off_over.png | Bin .../pause_on_default.png | Bin .../pause_on_over.png | Bin .../settings_default.png | Bin .../settings_over.png | Bin .../settings_selected.png | Bin .../setup_back_default.png | Bin .../setup_back_disabled.png | Bin .../setup_back_over.png | Bin .../setup_cancel_default.png | Bin .../setup_cancel_disabled.png | Bin .../setup_cancel_over.png} | Bin .../setup_start_default.png | Bin .../setup_start_disabled.png | Bin .../setup_start_over.png | Bin .../speaker_off_default.png | Bin .../speaker_off_disabled.png | Bin .../speaker_off_over.png | Bin .../speaker_on_default.png | Bin .../speaker_on_disabled.png | Bin .../speaker_on_over.png | Bin .../splashscreen.png | Bin .../statebar_background.png | Bin .../unknown_small.png | Bin .../video_off_default.png | Bin .../video_off_disabled.png | Bin .../video_off_over.png | Bin .../video_on_default.png | Bin .../video_on_disabled.png | Bin .../video_on_over.png | Bin res/layout-sw600dp-land/audio.xml | 13 +++++++++ src/org/linphone/AudioCallFragment.java | 6 +++- src/org/linphone/LinphoneActivity.java | 11 +++---- src/org/linphone/setup/SetupActivity.java | 27 ++++++++++++------ 104 files changed, 44 insertions(+), 15 deletions(-) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/add_call_more_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/add_call_more_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/add_call_more_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/add_contact_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/add_contact_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/add_contact_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/back_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/back_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/back_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/background_alt.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/background_logo.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/backspace_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/backspace_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/backspace_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/bottom.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/call_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/call_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/call_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/cancel_white_bg_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/cancel_white_bg_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/cancel_white_bg_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/chat_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/chat_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/chat_selected.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/conference_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/conference_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/contacts_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/contacts_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/contacts_selected.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/dialer_address_background.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/dialer_alt_back_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/dialer_alt_back_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/dialer_alt_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/dialer_alt_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/dialer_alt_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/dialer_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/dialer_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/dialer_selected.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/hangup_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/hangup_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/history_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/history_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/history_selected.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/mark.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/micro_off_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/micro_off_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/micro_off_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/micro_on_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/micro_on_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/micro_on_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_add_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_add_default_alt.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_add_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_add_disabled_alt.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_add_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_add_over_alt.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_default_alt.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_disabled_alt.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_over_alt.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_selected.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_selected_alt.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_transfer_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_transfer_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/options_transfer_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/pause_off_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/pause_off_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/pause_off_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/pause_on_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/pause_on_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/settings_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/settings_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/settings_selected.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/setup_back_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/setup_back_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/setup_back_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/setup_cancel_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/setup_cancel_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi/setup_cancel_over_.png => drawable-sw600dp-xhdpi/setup_cancel_over.png} (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/setup_start_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/setup_start_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/setup_start_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/speaker_off_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/speaker_off_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/speaker_off_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/speaker_on_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/speaker_on_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/speaker_on_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/splashscreen.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/statebar_background.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/unknown_small.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/video_off_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/video_off_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/video_off_over.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/video_on_default.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/video_on_disabled.png (100%) rename res/{drawable-sw600dp-land-xhdpi => drawable-sw600dp-xhdpi}/video_on_over.png (100%) create mode 100644 res/layout-sw600dp-land/audio.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 35f81fffe..0c5a66b98 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -75,7 +75,7 @@ android:theme="@style/NoTitle" android:noHistory="true" android:launchMode="singleTop" - android:screenOrientation="nosensor"> + android:screenOrientation="behind"> diff --git a/res/drawable-sw600dp-land-xhdpi/add_call_more_default.png b/res/drawable-sw600dp-xhdpi/add_call_more_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/add_call_more_default.png rename to res/drawable-sw600dp-xhdpi/add_call_more_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/add_call_more_disabled.png b/res/drawable-sw600dp-xhdpi/add_call_more_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/add_call_more_disabled.png rename to res/drawable-sw600dp-xhdpi/add_call_more_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/add_call_more_over.png b/res/drawable-sw600dp-xhdpi/add_call_more_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/add_call_more_over.png rename to res/drawable-sw600dp-xhdpi/add_call_more_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/add_contact_default.png b/res/drawable-sw600dp-xhdpi/add_contact_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/add_contact_default.png rename to res/drawable-sw600dp-xhdpi/add_contact_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/add_contact_disabled.png b/res/drawable-sw600dp-xhdpi/add_contact_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/add_contact_disabled.png rename to res/drawable-sw600dp-xhdpi/add_contact_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/add_contact_over.png b/res/drawable-sw600dp-xhdpi/add_contact_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/add_contact_over.png rename to res/drawable-sw600dp-xhdpi/add_contact_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/back_default.png b/res/drawable-sw600dp-xhdpi/back_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/back_default.png rename to res/drawable-sw600dp-xhdpi/back_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/back_disabled.png b/res/drawable-sw600dp-xhdpi/back_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/back_disabled.png rename to res/drawable-sw600dp-xhdpi/back_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/back_over.png b/res/drawable-sw600dp-xhdpi/back_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/back_over.png rename to res/drawable-sw600dp-xhdpi/back_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/background_alt.png b/res/drawable-sw600dp-xhdpi/background_alt.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/background_alt.png rename to res/drawable-sw600dp-xhdpi/background_alt.png diff --git a/res/drawable-sw600dp-land-xhdpi/background_logo.png b/res/drawable-sw600dp-xhdpi/background_logo.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/background_logo.png rename to res/drawable-sw600dp-xhdpi/background_logo.png diff --git a/res/drawable-sw600dp-land-xhdpi/backspace_default.png b/res/drawable-sw600dp-xhdpi/backspace_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/backspace_default.png rename to res/drawable-sw600dp-xhdpi/backspace_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/backspace_disabled.png b/res/drawable-sw600dp-xhdpi/backspace_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/backspace_disabled.png rename to res/drawable-sw600dp-xhdpi/backspace_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/backspace_over.png b/res/drawable-sw600dp-xhdpi/backspace_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/backspace_over.png rename to res/drawable-sw600dp-xhdpi/backspace_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/bottom.png b/res/drawable-sw600dp-xhdpi/bottom.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/bottom.png rename to res/drawable-sw600dp-xhdpi/bottom.png diff --git a/res/drawable-sw600dp-land-xhdpi/call_default.png b/res/drawable-sw600dp-xhdpi/call_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/call_default.png rename to res/drawable-sw600dp-xhdpi/call_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/call_disabled.png b/res/drawable-sw600dp-xhdpi/call_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/call_disabled.png rename to res/drawable-sw600dp-xhdpi/call_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/call_over.png b/res/drawable-sw600dp-xhdpi/call_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/call_over.png rename to res/drawable-sw600dp-xhdpi/call_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/cancel_white_bg_default.png b/res/drawable-sw600dp-xhdpi/cancel_white_bg_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/cancel_white_bg_default.png rename to res/drawable-sw600dp-xhdpi/cancel_white_bg_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/cancel_white_bg_disabled.png b/res/drawable-sw600dp-xhdpi/cancel_white_bg_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/cancel_white_bg_disabled.png rename to res/drawable-sw600dp-xhdpi/cancel_white_bg_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/cancel_white_bg_over.png b/res/drawable-sw600dp-xhdpi/cancel_white_bg_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/cancel_white_bg_over.png rename to res/drawable-sw600dp-xhdpi/cancel_white_bg_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/chat_default.png b/res/drawable-sw600dp-xhdpi/chat_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/chat_default.png rename to res/drawable-sw600dp-xhdpi/chat_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/chat_over.png b/res/drawable-sw600dp-xhdpi/chat_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/chat_over.png rename to res/drawable-sw600dp-xhdpi/chat_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/chat_selected.png b/res/drawable-sw600dp-xhdpi/chat_selected.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/chat_selected.png rename to res/drawable-sw600dp-xhdpi/chat_selected.png diff --git a/res/drawable-sw600dp-land-xhdpi/conference_default.png b/res/drawable-sw600dp-xhdpi/conference_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/conference_default.png rename to res/drawable-sw600dp-xhdpi/conference_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/conference_over.png b/res/drawable-sw600dp-xhdpi/conference_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/conference_over.png rename to res/drawable-sw600dp-xhdpi/conference_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/contacts_default.png b/res/drawable-sw600dp-xhdpi/contacts_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/contacts_default.png rename to res/drawable-sw600dp-xhdpi/contacts_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/contacts_over.png b/res/drawable-sw600dp-xhdpi/contacts_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/contacts_over.png rename to res/drawable-sw600dp-xhdpi/contacts_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/contacts_selected.png b/res/drawable-sw600dp-xhdpi/contacts_selected.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/contacts_selected.png rename to res/drawable-sw600dp-xhdpi/contacts_selected.png diff --git a/res/drawable-sw600dp-land-xhdpi/dialer_address_background.png b/res/drawable-sw600dp-xhdpi/dialer_address_background.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/dialer_address_background.png rename to res/drawable-sw600dp-xhdpi/dialer_address_background.png diff --git a/res/drawable-sw600dp-land-xhdpi/dialer_alt_back_default.png b/res/drawable-sw600dp-xhdpi/dialer_alt_back_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/dialer_alt_back_default.png rename to res/drawable-sw600dp-xhdpi/dialer_alt_back_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/dialer_alt_back_over.png b/res/drawable-sw600dp-xhdpi/dialer_alt_back_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/dialer_alt_back_over.png rename to res/drawable-sw600dp-xhdpi/dialer_alt_back_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/dialer_alt_default.png b/res/drawable-sw600dp-xhdpi/dialer_alt_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/dialer_alt_default.png rename to res/drawable-sw600dp-xhdpi/dialer_alt_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/dialer_alt_disabled.png b/res/drawable-sw600dp-xhdpi/dialer_alt_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/dialer_alt_disabled.png rename to res/drawable-sw600dp-xhdpi/dialer_alt_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/dialer_alt_over.png b/res/drawable-sw600dp-xhdpi/dialer_alt_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/dialer_alt_over.png rename to res/drawable-sw600dp-xhdpi/dialer_alt_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/dialer_default.png b/res/drawable-sw600dp-xhdpi/dialer_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/dialer_default.png rename to res/drawable-sw600dp-xhdpi/dialer_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/dialer_over.png b/res/drawable-sw600dp-xhdpi/dialer_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/dialer_over.png rename to res/drawable-sw600dp-xhdpi/dialer_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/dialer_selected.png b/res/drawable-sw600dp-xhdpi/dialer_selected.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/dialer_selected.png rename to res/drawable-sw600dp-xhdpi/dialer_selected.png diff --git a/res/drawable-sw600dp-land-xhdpi/hangup_default.png b/res/drawable-sw600dp-xhdpi/hangup_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/hangup_default.png rename to res/drawable-sw600dp-xhdpi/hangup_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/hangup_over.png b/res/drawable-sw600dp-xhdpi/hangup_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/hangup_over.png rename to res/drawable-sw600dp-xhdpi/hangup_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/history_default.png b/res/drawable-sw600dp-xhdpi/history_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/history_default.png rename to res/drawable-sw600dp-xhdpi/history_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/history_over.png b/res/drawable-sw600dp-xhdpi/history_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/history_over.png rename to res/drawable-sw600dp-xhdpi/history_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/history_selected.png b/res/drawable-sw600dp-xhdpi/history_selected.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/history_selected.png rename to res/drawable-sw600dp-xhdpi/history_selected.png diff --git a/res/drawable-sw600dp-land-xhdpi/mark.png b/res/drawable-sw600dp-xhdpi/mark.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/mark.png rename to res/drawable-sw600dp-xhdpi/mark.png diff --git a/res/drawable-sw600dp-land-xhdpi/micro_off_default.png b/res/drawable-sw600dp-xhdpi/micro_off_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/micro_off_default.png rename to res/drawable-sw600dp-xhdpi/micro_off_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/micro_off_disabled.png b/res/drawable-sw600dp-xhdpi/micro_off_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/micro_off_disabled.png rename to res/drawable-sw600dp-xhdpi/micro_off_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/micro_off_over.png b/res/drawable-sw600dp-xhdpi/micro_off_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/micro_off_over.png rename to res/drawable-sw600dp-xhdpi/micro_off_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/micro_on_default.png b/res/drawable-sw600dp-xhdpi/micro_on_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/micro_on_default.png rename to res/drawable-sw600dp-xhdpi/micro_on_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/micro_on_disabled.png b/res/drawable-sw600dp-xhdpi/micro_on_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/micro_on_disabled.png rename to res/drawable-sw600dp-xhdpi/micro_on_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/micro_on_over.png b/res/drawable-sw600dp-xhdpi/micro_on_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/micro_on_over.png rename to res/drawable-sw600dp-xhdpi/micro_on_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_add_default.png b/res/drawable-sw600dp-xhdpi/options_add_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_add_default.png rename to res/drawable-sw600dp-xhdpi/options_add_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_add_default_alt.png b/res/drawable-sw600dp-xhdpi/options_add_default_alt.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_add_default_alt.png rename to res/drawable-sw600dp-xhdpi/options_add_default_alt.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_add_disabled.png b/res/drawable-sw600dp-xhdpi/options_add_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_add_disabled.png rename to res/drawable-sw600dp-xhdpi/options_add_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_add_disabled_alt.png b/res/drawable-sw600dp-xhdpi/options_add_disabled_alt.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_add_disabled_alt.png rename to res/drawable-sw600dp-xhdpi/options_add_disabled_alt.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_add_over.png b/res/drawable-sw600dp-xhdpi/options_add_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_add_over.png rename to res/drawable-sw600dp-xhdpi/options_add_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_add_over_alt.png b/res/drawable-sw600dp-xhdpi/options_add_over_alt.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_add_over_alt.png rename to res/drawable-sw600dp-xhdpi/options_add_over_alt.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_default.png b/res/drawable-sw600dp-xhdpi/options_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_default.png rename to res/drawable-sw600dp-xhdpi/options_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_default_alt.png b/res/drawable-sw600dp-xhdpi/options_default_alt.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_default_alt.png rename to res/drawable-sw600dp-xhdpi/options_default_alt.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_disabled.png b/res/drawable-sw600dp-xhdpi/options_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_disabled.png rename to res/drawable-sw600dp-xhdpi/options_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_disabled_alt.png b/res/drawable-sw600dp-xhdpi/options_disabled_alt.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_disabled_alt.png rename to res/drawable-sw600dp-xhdpi/options_disabled_alt.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_over.png b/res/drawable-sw600dp-xhdpi/options_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_over.png rename to res/drawable-sw600dp-xhdpi/options_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_over_alt.png b/res/drawable-sw600dp-xhdpi/options_over_alt.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_over_alt.png rename to res/drawable-sw600dp-xhdpi/options_over_alt.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_selected.png b/res/drawable-sw600dp-xhdpi/options_selected.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_selected.png rename to res/drawable-sw600dp-xhdpi/options_selected.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_selected_alt.png b/res/drawable-sw600dp-xhdpi/options_selected_alt.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_selected_alt.png rename to res/drawable-sw600dp-xhdpi/options_selected_alt.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_transfer_default.png b/res/drawable-sw600dp-xhdpi/options_transfer_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_transfer_default.png rename to res/drawable-sw600dp-xhdpi/options_transfer_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_transfer_disabled.png b/res/drawable-sw600dp-xhdpi/options_transfer_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_transfer_disabled.png rename to res/drawable-sw600dp-xhdpi/options_transfer_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/options_transfer_over.png b/res/drawable-sw600dp-xhdpi/options_transfer_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/options_transfer_over.png rename to res/drawable-sw600dp-xhdpi/options_transfer_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/pause_off_default.png b/res/drawable-sw600dp-xhdpi/pause_off_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/pause_off_default.png rename to res/drawable-sw600dp-xhdpi/pause_off_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/pause_off_disabled.png b/res/drawable-sw600dp-xhdpi/pause_off_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/pause_off_disabled.png rename to res/drawable-sw600dp-xhdpi/pause_off_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/pause_off_over.png b/res/drawable-sw600dp-xhdpi/pause_off_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/pause_off_over.png rename to res/drawable-sw600dp-xhdpi/pause_off_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/pause_on_default.png b/res/drawable-sw600dp-xhdpi/pause_on_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/pause_on_default.png rename to res/drawable-sw600dp-xhdpi/pause_on_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/pause_on_over.png b/res/drawable-sw600dp-xhdpi/pause_on_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/pause_on_over.png rename to res/drawable-sw600dp-xhdpi/pause_on_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/settings_default.png b/res/drawable-sw600dp-xhdpi/settings_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/settings_default.png rename to res/drawable-sw600dp-xhdpi/settings_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/settings_over.png b/res/drawable-sw600dp-xhdpi/settings_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/settings_over.png rename to res/drawable-sw600dp-xhdpi/settings_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/settings_selected.png b/res/drawable-sw600dp-xhdpi/settings_selected.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/settings_selected.png rename to res/drawable-sw600dp-xhdpi/settings_selected.png diff --git a/res/drawable-sw600dp-land-xhdpi/setup_back_default.png b/res/drawable-sw600dp-xhdpi/setup_back_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/setup_back_default.png rename to res/drawable-sw600dp-xhdpi/setup_back_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/setup_back_disabled.png b/res/drawable-sw600dp-xhdpi/setup_back_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/setup_back_disabled.png rename to res/drawable-sw600dp-xhdpi/setup_back_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/setup_back_over.png b/res/drawable-sw600dp-xhdpi/setup_back_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/setup_back_over.png rename to res/drawable-sw600dp-xhdpi/setup_back_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/setup_cancel_default.png b/res/drawable-sw600dp-xhdpi/setup_cancel_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/setup_cancel_default.png rename to res/drawable-sw600dp-xhdpi/setup_cancel_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/setup_cancel_disabled.png b/res/drawable-sw600dp-xhdpi/setup_cancel_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/setup_cancel_disabled.png rename to res/drawable-sw600dp-xhdpi/setup_cancel_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/setup_cancel_over_.png b/res/drawable-sw600dp-xhdpi/setup_cancel_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/setup_cancel_over_.png rename to res/drawable-sw600dp-xhdpi/setup_cancel_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/setup_start_default.png b/res/drawable-sw600dp-xhdpi/setup_start_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/setup_start_default.png rename to res/drawable-sw600dp-xhdpi/setup_start_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/setup_start_disabled.png b/res/drawable-sw600dp-xhdpi/setup_start_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/setup_start_disabled.png rename to res/drawable-sw600dp-xhdpi/setup_start_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/setup_start_over.png b/res/drawable-sw600dp-xhdpi/setup_start_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/setup_start_over.png rename to res/drawable-sw600dp-xhdpi/setup_start_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/speaker_off_default.png b/res/drawable-sw600dp-xhdpi/speaker_off_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/speaker_off_default.png rename to res/drawable-sw600dp-xhdpi/speaker_off_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/speaker_off_disabled.png b/res/drawable-sw600dp-xhdpi/speaker_off_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/speaker_off_disabled.png rename to res/drawable-sw600dp-xhdpi/speaker_off_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/speaker_off_over.png b/res/drawable-sw600dp-xhdpi/speaker_off_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/speaker_off_over.png rename to res/drawable-sw600dp-xhdpi/speaker_off_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/speaker_on_default.png b/res/drawable-sw600dp-xhdpi/speaker_on_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/speaker_on_default.png rename to res/drawable-sw600dp-xhdpi/speaker_on_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/speaker_on_disabled.png b/res/drawable-sw600dp-xhdpi/speaker_on_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/speaker_on_disabled.png rename to res/drawable-sw600dp-xhdpi/speaker_on_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/speaker_on_over.png b/res/drawable-sw600dp-xhdpi/speaker_on_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/speaker_on_over.png rename to res/drawable-sw600dp-xhdpi/speaker_on_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/splashscreen.png b/res/drawable-sw600dp-xhdpi/splashscreen.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/splashscreen.png rename to res/drawable-sw600dp-xhdpi/splashscreen.png diff --git a/res/drawable-sw600dp-land-xhdpi/statebar_background.png b/res/drawable-sw600dp-xhdpi/statebar_background.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/statebar_background.png rename to res/drawable-sw600dp-xhdpi/statebar_background.png diff --git a/res/drawable-sw600dp-land-xhdpi/unknown_small.png b/res/drawable-sw600dp-xhdpi/unknown_small.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/unknown_small.png rename to res/drawable-sw600dp-xhdpi/unknown_small.png diff --git a/res/drawable-sw600dp-land-xhdpi/video_off_default.png b/res/drawable-sw600dp-xhdpi/video_off_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/video_off_default.png rename to res/drawable-sw600dp-xhdpi/video_off_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/video_off_disabled.png b/res/drawable-sw600dp-xhdpi/video_off_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/video_off_disabled.png rename to res/drawable-sw600dp-xhdpi/video_off_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/video_off_over.png b/res/drawable-sw600dp-xhdpi/video_off_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/video_off_over.png rename to res/drawable-sw600dp-xhdpi/video_off_over.png diff --git a/res/drawable-sw600dp-land-xhdpi/video_on_default.png b/res/drawable-sw600dp-xhdpi/video_on_default.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/video_on_default.png rename to res/drawable-sw600dp-xhdpi/video_on_default.png diff --git a/res/drawable-sw600dp-land-xhdpi/video_on_disabled.png b/res/drawable-sw600dp-xhdpi/video_on_disabled.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/video_on_disabled.png rename to res/drawable-sw600dp-xhdpi/video_on_disabled.png diff --git a/res/drawable-sw600dp-land-xhdpi/video_on_over.png b/res/drawable-sw600dp-xhdpi/video_on_over.png similarity index 100% rename from res/drawable-sw600dp-land-xhdpi/video_on_over.png rename to res/drawable-sw600dp-xhdpi/video_on_over.png diff --git a/res/layout-sw600dp-land/audio.xml b/res/layout-sw600dp-land/audio.xml new file mode 100644 index 000000000..891887a5a --- /dev/null +++ b/res/layout-sw600dp-land/audio.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/src/org/linphone/AudioCallFragment.java b/src/org/linphone/AudioCallFragment.java index bf62090e0..22d84e0ca 100644 --- a/src/org/linphone/AudioCallFragment.java +++ b/src/org/linphone/AudioCallFragment.java @@ -47,11 +47,12 @@ import android.widget.TextView; public class AudioCallFragment extends Fragment implements OnClickListener { private static final int rowHeight = 75; // Value set in active_call.xml private static final int rowImageHeight = 75; // Value set in avatar.xml + private static final int rowImageHeightTablet = 150; // Value set in avatar.xml private static final int botMarginIfImage = 25; private static final int rowThickRatio = 85; // Ratio dependent from the image private static final int topMargin = (int) ((rowHeight * rowThickRatio) / 100); private static final int conferenceMargin = 20; - private static final int topMarginWithImage = topMargin + rowImageHeight + botMarginIfImage; + private static int topMarginWithImage = topMargin + rowImageHeight + botMarginIfImage; private RelativeLayout callsList; private LayoutInflater inflater; @@ -71,6 +72,9 @@ public class AudioCallFragment extends Fragment implements OnClickListener { View view = inflater.inflate(R.layout.audio, container, false); callsList = (RelativeLayout) view.findViewById(R.id.calls); + if (getResources().getBoolean(R.bool.isTablet)) + topMarginWithImage = topMargin + rowImageHeightTablet + botMarginIfImage; + return view; } diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 2e547f6aa..b477a8739 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -52,6 +52,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.ActivityInfo; import android.database.Cursor; import android.graphics.Bitmap; import android.net.Uri; @@ -124,6 +125,10 @@ public class LinphoneActivity extends FragmentActivity implements protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (isTablet() && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + } + if (!LinphoneManager.isInstanciated()) { Log.e("No service running: avoid crash by starting the launcher", this.getClass().getName()); // super.onCreate called earlier @@ -1339,11 +1344,7 @@ public class LinphoneActivity extends FragmentActivity implements if (LinphoneUtils.onKeyBackGoHome(this, keyCode, event)) { return true; } - } else { - if (isTablet()) { - return true; - } - + } else if (!isTablet()) { int backStackEntryCount = getSupportFragmentManager().getBackStackEntryCount(); if (backStackEntryCount <= 1) { showStatusBar(); diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java index 8f2088d6a..2a191213c 100644 --- a/src/org/linphone/setup/SetupActivity.java +++ b/src/org/linphone/setup/SetupActivity.java @@ -25,6 +25,7 @@ import org.linphone.mediastream.video.capture.hwconf.Hacks; import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; +import android.content.pm.ActivityInfo; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; @@ -47,17 +48,21 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.setup); + + if (getResources().getBoolean(R.bool.isTablet) && getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + } + + setContentView(R.layout.setup); if (findViewById(R.id.fragmentContainer) != null) { - if (savedInstanceState != null) { - return; + if (savedInstanceState == null) { + WelcomeFragment welcomeFragment = new WelcomeFragment(); + getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, welcomeFragment).commit(); + currentFragment = SetupFragments.WELCOME; + } else { + currentFragment = (SetupFragments) savedInstanceState.getSerializable("CurrentFragment"); } - - WelcomeFragment welcomeFragment = new WelcomeFragment(); - getSupportFragmentManager().beginTransaction().add(R.id.fragmentContainer, welcomeFragment).commit(); - - currentFragment = SetupFragments.WELCOME; } mPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); @@ -66,6 +71,12 @@ public class SetupActivity extends FragmentActivity implements OnClickListener { instance = this; }; + @Override + protected void onSaveInstanceState(Bundle outState) { + outState.putSerializable("CurrentFragment", currentFragment); + super.onSaveInstanceState(outState); + } + public static SetupActivity instance() { return instance; }