diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java index 7a8130d8a..081aec9e6 100644 --- a/src/org/linphone/AboutFragment.java +++ b/src/org/linphone/AboutFragment.java @@ -63,6 +63,10 @@ public class AboutFragment extends Fragment implements OnClickListener { if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(about); + + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } } } diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index db7815a2a..88b386072 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -587,6 +587,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHAT); LinphoneActivity.instance().updateChatFragment(this); + + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } } if (LinphoneActivity.isInstanciated()) { diff --git a/src/org/linphone/ChatListFragment.java b/src/org/linphone/ChatListFragment.java index c57ab4d04..8db5d70ce 100644 --- a/src/org/linphone/ChatListFragment.java +++ b/src/org/linphone/ChatListFragment.java @@ -177,6 +177,10 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHATLIST); LinphoneActivity.instance().updateChatListFragment(this); + + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } } refresh(); diff --git a/src/org/linphone/ContactFragment.java b/src/org/linphone/ContactFragment.java index 7d86cd1af..65f7787d4 100644 --- a/src/org/linphone/ContactFragment.java +++ b/src/org/linphone/ContactFragment.java @@ -171,9 +171,15 @@ public class ContactFragment extends Fragment implements OnClickListener { @Override public void onResume() { super.onResume(); + if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.CONTACT); + + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } } + contact.refresh(getActivity().getContentResolver()); if (contact.getName() == null || contact.getName().equals("")) { //Contact has been deleted, return diff --git a/src/org/linphone/ContactsFragment.java b/src/org/linphone/ContactsFragment.java index 8e990c147..617241844 100644 --- a/src/org/linphone/ContactsFragment.java +++ b/src/org/linphone/ContactsFragment.java @@ -187,6 +187,10 @@ public class ContactsFragment extends Fragment implements OnClickListener, OnIte if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.CONTACTS); onlyDisplayLinphoneContacts = LinphoneActivity.instance().isLinphoneContactsPrefered(); + + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } } invalidate(); diff --git a/src/org/linphone/DialerFragment.java b/src/org/linphone/DialerFragment.java index 7a3209c01..be9d5bd18 100644 --- a/src/org/linphone/DialerFragment.java +++ b/src/org/linphone/DialerFragment.java @@ -24,7 +24,6 @@ import org.linphone.ui.AddressText; import org.linphone.ui.CallButton; import org.linphone.ui.EraseButton; -import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -132,28 +131,10 @@ public class DialerFragment extends Fragment { return instance; } - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - if (LinphoneActivity.isInstanciated()) { - LinphoneActivity.instance().updateDialerFragment(this); - LinphoneActivity.instance().showStatusBar(); - } - } - - @Override - public void onDetach() { - if (LinphoneActivity.isInstanciated()) { - if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { - LinphoneActivity.instance().hideStatusBar(); - } - } - super.onDetach(); - } - @Override public void onResume() { super.onResume(); + if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.DIALER); LinphoneActivity.instance().updateDialerFragment(this); @@ -173,16 +154,6 @@ public class DialerFragment extends Fragment { resetLayout(isCallTransferOngoing); } - @Override - public void onPause() { - if (LinphoneActivity.isInstanciated()) { - if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { - LinphoneActivity.instance().hideStatusBar(); - } - } - super.onPause(); - } - public void resetLayout(boolean callTransfer) { isCallTransferOngoing = callTransfer; LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); diff --git a/src/org/linphone/EditContactFragment.java b/src/org/linphone/EditContactFragment.java index a358262d0..14b6246fc 100644 --- a/src/org/linphone/EditContactFragment.java +++ b/src/org/linphone/EditContactFragment.java @@ -186,6 +186,17 @@ public class EditContactFragment extends Fragment { return view; } + @Override + public void onResume() { + super.onResume(); + + if (LinphoneActivity.isInstanciated()) { + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } + } + } + private void initNumbersFields(final TableLayout controls, final Contact contact) { controls.removeAllViews(); numbersAndAddresses = new ArrayList(); diff --git a/src/org/linphone/HistoryDetailFragment.java b/src/org/linphone/HistoryDetailFragment.java index ebbfbe432..6efb6db65 100644 --- a/src/org/linphone/HistoryDetailFragment.java +++ b/src/org/linphone/HistoryDetailFragment.java @@ -132,8 +132,13 @@ public class HistoryDetailFragment extends Fragment implements OnClickListener { @Override public void onResume() { super.onResume(); + if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.HISTORY_DETAIL); + + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } } } diff --git a/src/org/linphone/HistoryFragment.java b/src/org/linphone/HistoryFragment.java index 5acf9f3b2..c5ac08e02 100644 --- a/src/org/linphone/HistoryFragment.java +++ b/src/org/linphone/HistoryFragment.java @@ -115,8 +115,14 @@ public class HistoryFragment extends Fragment implements OnClickListener, OnChil @Override public void onResume() { super.onResume(); - if (LinphoneActivity.isInstanciated()) + + if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.HISTORY); + + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } + } initLogsLists(Arrays.asList(LinphoneManager.getLc().getCallLogs())); if (!hideHistoryListAndDisplayMessageIfEmpty()) { diff --git a/src/org/linphone/HistorySimpleFragment.java b/src/org/linphone/HistorySimpleFragment.java index 0dc71b752..0827efd1d 100644 --- a/src/org/linphone/HistorySimpleFragment.java +++ b/src/org/linphone/HistorySimpleFragment.java @@ -130,8 +130,14 @@ public class HistorySimpleFragment extends Fragment implements OnClickListener, @Override public void onResume() { super.onResume(); - if (LinphoneActivity.isInstanciated()) + + if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.HISTORY); + + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } + } mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs()); if (!hideHistoryListAndDisplayMessageIfEmpty()) { diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java index 36642fe26..554882320 100644 --- a/src/org/linphone/SettingsFragment.java +++ b/src/org/linphone/SettingsFragment.java @@ -891,6 +891,10 @@ public class SettingsFragment extends PreferencesListFragment implements EcCalib if (LinphoneActivity.isInstanciated()) { LinphoneActivity.instance().selectMenu(FragmentsAvailable.SETTINGS); + + if (getResources().getBoolean(R.bool.show_statusbar_only_on_dialer)) { + LinphoneActivity.instance().hideStatusBar(); + } } } }