diff --git a/app/src/main/java/org/linphone/activities/AboutActivity.java b/app/src/main/java/org/linphone/activities/AboutActivity.java index 6d45dfe93..475d64760 100644 --- a/app/src/main/java/org/linphone/activities/AboutActivity.java +++ b/app/src/main/java/org/linphone/activities/AboutActivity.java @@ -49,6 +49,7 @@ public class AboutActivity extends MainActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mOnBackPressGoHome = false; + mAlwaysHideTabBar = true; // Uses the fragment container layout to inflate the about view instead of using a fragment View aboutView = LayoutInflater.from(this).inflate(R.layout.about, null, false); diff --git a/app/src/main/java/org/linphone/activities/MainActivity.java b/app/src/main/java/org/linphone/activities/MainActivity.java index a2288f70a..7375b08a8 100644 --- a/app/src/main/java/org/linphone/activities/MainActivity.java +++ b/app/src/main/java/org/linphone/activities/MainActivity.java @@ -91,6 +91,7 @@ public abstract class MainActivity extends LinphoneGenericActivity private StatusFragment mStatusFragment; protected boolean mOnBackPressGoHome; + protected boolean mAlwaysHideTabBar; protected String[] mPermissionsToHave; private CoreListenerStub mListener; @@ -102,6 +103,7 @@ public abstract class MainActivity extends LinphoneGenericActivity setContentView(R.layout.main); mOnBackPressGoHome = true; + mAlwaysHideTabBar = false; RelativeLayout history = findViewById(R.id.history); history.setOnClickListener( @@ -298,8 +300,10 @@ public abstract class MainActivity extends LinphoneGenericActivity super.onResume(); hideTopBar(); - if (getFragmentManager().getBackStackEntryCount() == 0 - || !getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) { + if (!mAlwaysHideTabBar + && (getFragmentManager().getBackStackEntryCount() == 0 + || !getResources() + .getBoolean(R.bool.hide_bottom_bar_on_second_level_views))) { showTabBar(); } @@ -387,8 +391,10 @@ public abstract class MainActivity extends LinphoneGenericActivity public boolean popBackStack() { if (getFragmentManager().getBackStackEntryCount() > 0) { getFragmentManager().popBackStackImmediate(); - if (getFragmentManager().getBackStackEntryCount() == 0 - && getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) { + if (!mAlwaysHideTabBar + && (getFragmentManager().getBackStackEntryCount() == 0 + && getResources() + .getBoolean(R.bool.hide_bottom_bar_on_second_level_views))) { showTabBar(); } return true; diff --git a/app/src/main/java/org/linphone/recording/RecordingsActivity.java b/app/src/main/java/org/linphone/recording/RecordingsActivity.java index 05f0fb334..22fff8968 100644 --- a/app/src/main/java/org/linphone/recording/RecordingsActivity.java +++ b/app/src/main/java/org/linphone/recording/RecordingsActivity.java @@ -52,6 +52,7 @@ public class RecordingsActivity extends MainActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mOnBackPressGoHome = false; + mAlwaysHideTabBar = true; // Uses the fragment container layout to inflate the about view instead of using a fragment View recordingsView = diff --git a/app/src/main/java/org/linphone/settings/SettingsActivity.java b/app/src/main/java/org/linphone/settings/SettingsActivity.java index ea46b1341..8f1cf07f0 100644 --- a/app/src/main/java/org/linphone/settings/SettingsActivity.java +++ b/app/src/main/java/org/linphone/settings/SettingsActivity.java @@ -38,6 +38,7 @@ public class SettingsActivity extends MainActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mOnBackPressGoHome = false; + mAlwaysHideTabBar = true; } @Override