From 1f54b20397168c6d432e538bc746124c981237dc Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 8 Oct 2013 15:09:47 +0200
Subject: [PATCH] Fix tablet display when pressing back button

---
 src/org/linphone/LinphoneActivity.java | 32 ++++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index ff0387eeb..0b0eac81e 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -101,6 +101,7 @@ public class LinphoneActivity extends FragmentActivity implements
 	private LinearLayout menu, mark;
 	private RelativeLayout contacts, history, settings, chat, aboutChat, aboutSettings;
 	private FragmentsAvailable currentFragment, nextFragment;
+	private List<FragmentsAvailable> fragmentsHistory;
 	private Fragment dialerFragment, messageListenerFragment, messageListFragment, friendStatusListenerFragment;
 	private SavedState dialerSavedState;
 	private boolean preferLinphoneContacts = false, isAnimationDisabled = false, isContactPresenceDisabled = true;
@@ -146,9 +147,11 @@ public class LinphoneActivity extends FragmentActivity implements
 
 		setContentView(R.layout.main);
 		instance = this;
+		fragmentsHistory = new ArrayList<FragmentsAvailable>();
 		initButtons();
 
 		currentFragment = nextFragment = FragmentsAvailable.DIALER;
+		fragmentsHistory.add(currentFragment);
 		if (savedInstanceState == null) {
 			if (findViewById(R.id.fragmentContainer) != null) {
 				dialerFragment = new DialerFragment();
@@ -422,6 +425,10 @@ public class LinphoneActivity extends FragmentActivity implements
 		getSupportFragmentManager().executePendingTransactions();
 		
 		currentFragment = newFragmentType;
+		if (currentFragment == FragmentsAvailable.DIALER) {
+			fragmentsHistory.clear();
+		}
+		fragmentsHistory.add(currentFragment);
 	}
 
 	public void displayHistoryDetail(String sipUri, LinphoneCallLog log) {
@@ -673,11 +680,6 @@ public class LinphoneActivity extends FragmentActivity implements
 		}
 	}
 
-	@Deprecated
-	private void reloadConfig() {
-		// Nothing to do here anymore
-	}
-
 	public void displayAccountSettings(int accountNumber) {
 		Bundle bundle = new Bundle();
 		bundle.putInt("Account", accountNumber);
@@ -1357,7 +1359,6 @@ public class LinphoneActivity extends FragmentActivity implements
 	
 					if (currentFragment == FragmentsAvailable.SETTINGS) {
 						showStatusBar();
-						reloadConfig();
 						updateAnimationsState();
 					} else if (currentFragment == FragmentsAvailable.CHATLIST) {
 						//Hack to ensure display the status bar on some devices
@@ -1365,9 +1366,26 @@ public class LinphoneActivity extends FragmentActivity implements
 					}
 				} else {
 					if (currentFragment == FragmentsAvailable.SETTINGS) {
-						reloadConfig();
 						updateAnimationsState();
 					}
+					
+					fragmentsHistory.remove(fragmentsHistory.size() - 1);
+					FragmentsAvailable newFragmentType = fragmentsHistory.get(fragmentsHistory.size() - 1);
+					LinearLayout ll = (LinearLayout) findViewById(R.id.fragmentContainer2);
+					if (newFragmentType.shouldAddItselfToTheRightOf(currentFragment)) {
+						ll.setVisibility(View.VISIBLE);
+					} else {
+						if (newFragmentType == FragmentsAvailable.DIALER 
+								|| newFragmentType == FragmentsAvailable.ABOUT 
+								|| newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_CHAT 
+								|| newFragmentType == FragmentsAvailable.ABOUT_INSTEAD_OF_SETTINGS
+								|| newFragmentType == FragmentsAvailable.SETTINGS 
+								|| newFragmentType == FragmentsAvailable.ACCOUNT_SETTINGS) {
+							ll.setVisibility(View.GONE);
+						} else {
+							ll.setVisibility(View.INVISIBLE);
+						}
+					}
 				}
 			}
 		} else if (keyCode == KeyEvent.KEYCODE_MENU && statusFragment != null) {