From b7869d703e062ab3e58622b41bc745c43c48e125 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 18 Sep 2015 18:32:25 +0200
Subject: [PATCH] Update main view

---
 res/xml/preferences.xml                | 2 +-
 src/org/linphone/LinphoneActivity.java | 1 -
 src/org/linphone/SettingsFragment.java | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 23384f475..18039cb16 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -10,7 +10,7 @@
 	    android:key="@string/pref_sipaccounts_key"/>
 
 	<Preference
-	    android:title="@string/setup_title"
+	    android:title="@string/assistant_title"
 	    android:key="@string/setup_key"/>
 	
 	<Preference
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 63bdc255d..8e3577fb2 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -791,7 +791,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 	public void displaySettings() {
 		changeCurrentFragment(FragmentsAvailable.SETTINGS, null);
-		//settings.setSelected(true);
 	}
 
 	public void applyConfigChangesIfNeeded() {
diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 815fe4134..3deedf6ee 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -151,10 +151,6 @@ public class SettingsFragment extends PreferencesListFragment {
 
 	// Read the values set in resources and hides the settings accordingly
 	private void hideSettings() {
-		if (!getResources().getBoolean(R.bool.display_about_in_settings)) {
-			hidePreference(R.string.menu_about_key);
-		}
-
 		if (getResources().getBoolean(R.bool.hide_accounts)) {
 			emptyAndHidePreference(R.string.pref_sipaccounts_key);
 		}