X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ebe0f73068f8934742013b65ea0674f19ac82a2d..HEAD:/res/xml/preferences.xml?ds=inline

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 8aa945cf..4823a83f 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2015 ownCloud Inc.
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
@@ -18,40 +18,39 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-	<PreferenceCategory android:title="@string/prefs_category_general">
+    <PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">
+    </PreferenceCategory>
     
-    <!-- ListPreference
-        android:key="select_oc_account"
-        android:title="@string/prefs_select_oc_account"
-        android:summary="@string/prefs_summary_select_oc_account" 
-        / -->
-    <com.owncloud.android.ui.PreferenceMultiline android:title="@string/prefs_manage_accounts" android:key="manage_account" />
-    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 
-                        android:summary="@string/prefs_pincode_summary"/>
-    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading" 
-                        android:title="@string/prefs_instant_upload"  
-                        android:summary="@string/prefs_instant_upload_summary"/>
-    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="save_last_upload_location"
-        android:title="@string/prefs_remember_last_share_location"
-        android:summary="@string/prefs_remember_last_upload_location_summary"/>
-    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading" 
-        				android:disableDependentsState="true" 
-        				android:title="@string/instant_upload_on_wifi" 
-        				android:key="instant_upload_on_wifi"/>
-    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_video_uploading" 
-                        android:title="@string/prefs_instant_video_upload"  
-                        android:summary="@string/prefs_instant_video_upload_summary"/>
-    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_video_uploading" 
-        				android:disableDependentsState="true" 
-        				android:title="@string/instant_video_upload_on_wifi" 
-        				android:key="instant_video_upload_on_wifi"/>
-    <!-- DISABLED FOR RELEASE UNTIL FIXED 
-    CheckBoxPreference android:key="log_to_file" 
-                        android:title="@string/prefs_log_title"  
-                        android:summary="@string/prefs_log_summary"/>
-	<Preference 		android:key="log_history" 
-                        android:title="@string/prefs_log_title_history"  
-                        android:summary="@string/prefs_log_summary_history"/ -->
+	<PreferenceCategory android:title="@string/prefs_category_security">
+	    <android.preference.CheckBoxPreference android:title="@string/prefs_passcode" android:key="set_pincode" />
+	</PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
+         <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
+	                        android:title="@string/prefs_instant_upload"
+	                        android:summary="@string/prefs_instant_upload_summary"/>
+         <com.owncloud.android.ui.PreferenceWithLongSummary
+							android:title="@string/prefs_instant_upload_path_title"
+							android:key="instant_upload_path" />
+	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
+	        				android:title="@string/instant_upload_on_wifi"
+	        				android:key="instant_upload_on_wifi"/>
+	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_video_uploading"
+	                        android:title="@string/prefs_instant_video_upload"
+	                        android:summary="@string/prefs_instant_video_upload_summary" />
+	    <com.owncloud.android.ui.PreferenceWithLongSummary
+							android:title="@string/prefs_instant_video_upload_path_title"
+							android:key="instant_video_upload_path" />
+	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
+	        				android:title="@string/instant_video_upload_on_wifi"
+	        				android:key="instant_video_upload_on_wifi"/>
+	    <!-- DISABLED FOR RELEASE UNTIL FIXED
+	    CheckBoxPreference android:key="log_to_file"
+	                        android:title="@string/prefs_log_title"
+	                        android:summary="@string/prefs_log_summary"/>
+		<Preference 		android:key="log_history"
+	                        android:title="@string/prefs_log_title_history"
+	                        android:summary="@string/prefs_log_summary_history"/ -->
                         
     </PreferenceCategory>
 	
@@ -67,4 +66,4 @@
 	</PreferenceCategory>
     
 
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>