diff --git a/res/xml-v14/preferences.xml b/res/xml-v14/preferences.xml index b8d3a8c3e..3802a19d8 100644 --- a/res/xml-v14/preferences.xml +++ b/res/xml-v14/preferences.xml @@ -319,7 +319,7 @@ android:title="@string/pref_audio_hacks_use_galaxys_hack_title" /> diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index c14bfc30f..d8802f621 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -256,16 +256,22 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene if (statusFragment != null) { statusFragment.closeStatusBar(); } - - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + LinearLayout ll = (LinearLayout) findViewById(R.id.fragmentContainer2); + + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); if (newFragmentType.shouldAddItselfToTheRightOf(currentFragment)) { - LinearLayout ll = (LinearLayout) findViewById(R.id.fragmentContainer2); ll.setVisibility(View.VISIBLE); transaction.addToBackStack(newFragmentType.toString()); transaction.replace(R.id.fragmentContainer2, newFragment); } else { + if (newFragmentType == FragmentsAvailable.DIALER) { + ll.setVisibility(View.GONE); + } else { + ll.setVisibility(View.INVISIBLE); + } + if (!withoutAnimation && !getResources().getBoolean(R.bool.disable_animations) && currentFragment.shouldAnimate()) { if (newFragmentType.isRightOf(currentFragment)) { transaction.setCustomAnimations(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right); @@ -274,9 +280,6 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene } } - LinearLayout ll = (LinearLayout) findViewById(R.id.fragmentContainer2); - ll.setVisibility(View.GONE); - try { getSupportFragmentManager().popBackStackImmediate(newFragmentType.toString(), FragmentManager.POP_BACK_STACK_INCLUSIVE); } catch (java.lang.IllegalStateException e) { diff --git a/src/org/linphone/PreferencesActivity.java b/src/org/linphone/PreferencesActivity.java index 4e9f51da0..dce9e4ce7 100644 --- a/src/org/linphone/PreferencesActivity.java +++ b/src/org/linphone/PreferencesActivity.java @@ -296,7 +296,7 @@ public class PreferencesActivity extends LinphonePreferencesActivity implements addEchoPrefsListener(); - if (Hacks.needSoftvolume()) checkAndDisableCheckbox(R.string.pref_audio_soft_volume_key); + if (Hacks.needSoftvolume()) checkAndDisableCheckbox(R.string.pref_audio_hacks_use_galaxys_hack_key); if (!LinphoneManager.getLc().isTunnelAvailable()){ hidePreferenceCategory(R.string.pref_tunnel_key);