From 275131cb007d34b6ba255d79df7e839958d7a2cf Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 14 Jan 2013 11:25:04 +0100
Subject: [PATCH] Improved advanced menu of preferences to remove useless
 header or move some misplaced settings

---
 res/xml/preferences.xml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index f0ebff280..e75359ed2 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -277,16 +277,11 @@
 		
 		<PreferenceScreen 
 		    android:title="@string/pref_advanced">
-	
-		    <PreferenceCategory
-		        android:title="@string/pref_debug">
-		        
-				<CheckBoxPreference 
-				    android:key="@string/pref_debug_key"
-					android:title="@string/pref_debug"
-					android:defaultValue="@bool/pref_debug_default"/>
-			
-			</PreferenceCategory>
+	        
+			<CheckBoxPreference 
+			    android:key="@string/pref_debug_key"
+				android:title="@string/pref_debug"
+				android:defaultValue="@bool/pref_debug_default"/>
 			
 			<CheckBoxPreference 
 			    android:defaultValue="@bool/pref_animation_enable_default"
@@ -309,6 +304,11 @@
 				android:title="@string/pref_expire_title"
 			  	android:defaultValue="@string/pref_expire_default"
 			  	android:numeric="integer" />
+				 
+			 <EditTextPreference 
+				android:key="@string/pref_image_sharing_server_key"
+				android:title="@string/pref_image_sharing_server_title"
+			  	android:defaultValue="@string/pref_image_sharing_server_default" />
 			 
 			 <PreferenceCategory
 			     android:title="@string/pref_primary_account_title">
@@ -324,11 +324,6 @@
 			         android:key="@string/pref_user_name_key"/>
 			     
 			 </PreferenceCategory>
-				 
-			 <EditTextPreference 
-				android:key="@string/pref_image_sharing_server_key"
-				android:title="@string/pref_image_sharing_server_title"
-			  	android:defaultValue="@string/pref_image_sharing_server_default" />
 			
 			<PreferenceScreen
 			    android:title="@string/pref_audio_hacks_title"