From aeed3f4d453f95d65316f1873785dc17c5d791fa Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 30 May 2013 10:23:52 +0200
Subject: [PATCH] Fix nexus preferences not reloaded until reboot issue

---
 src/org/linphone/LinphoneActivity.java | 33 ++++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 98f9d0efe..45ffb4299 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1363,19 +1363,26 @@ public class LinphoneActivity extends FragmentActivity implements
 				} else if (LinphoneUtils.onKeyBackGoHome(this, keyCode, event)) {
 					return true;
 				}
-			} else if (!isTablet()) {
-				int backStackEntryCount = getSupportFragmentManager().getBackStackEntryCount();
-				if (backStackEntryCount <= 1) {
-					showStatusBar();
-				}
-
-				if (currentFragment == FragmentsAvailable.SETTINGS) {
-					showStatusBar();
-					reloadConfig();
-					updateAnimationsState();
-				} else if (currentFragment == FragmentsAvailable.CHATLIST) {
-					//Hack to ensure display the status bar on some devices
-					showStatusBar();
+			} else {
+				if (!isTablet()) {
+					int backStackEntryCount = getSupportFragmentManager().getBackStackEntryCount();
+					if (backStackEntryCount <= 1) {
+						showStatusBar();
+					}
+	
+					if (currentFragment == FragmentsAvailable.SETTINGS) {
+						showStatusBar();
+						reloadConfig();
+						updateAnimationsState();
+					} else if (currentFragment == FragmentsAvailable.CHATLIST) {
+						//Hack to ensure display the status bar on some devices
+						showStatusBar();
+					}
+				} else {
+					if (currentFragment == FragmentsAvailable.SETTINGS) {
+						reloadConfig();
+						updateAnimationsState();
+					}
 				}
 			}
 		} else if (keyCode == KeyEvent.KEYCODE_MENU && statusFragment != null) {