X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/844790057b6519bc6e90f49c139335a97aade4c8..b7664364d7bb5c185b82074dd8ef3ce69ddfe18a:/res/xml/preferences.xml

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index bda15014..b674cbc1 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -29,28 +29,25 @@
 	        / -->
 	    <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="save_last_upload_location"
-        android:title="@string/prefs_remember_last_share_location"
-        android:summary="@string/prefs_remember_last_upload_location_summary"/>
 	</PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/prefs_category_instant_uploading">
-	    <EditTextPreference android:title="@string/prefs_instant_upload_path_title"
-	        				android:defaultValue="@string/instant_upload_path"
-	        				android:key="instant_upload_path"/>
-	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
+    <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.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading"
-	        				android:disableDependentsState="true"
+         <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.CheckBoxPreferenceWithLongTitle android:dependency="instant_video_uploading"
-	        				android:disableDependentsState="true"
+	                        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
@@ -60,6 +57,7 @@
 		<Preference 		android:key="log_history"
 	                        android:title="@string/prefs_log_title_history"
 	                        android:summary="@string/prefs_log_summary_history"/ -->
+                        
     </PreferenceCategory>
 	
 	<PreferenceCategory android:title="@string/prefs_category_more" android:key="more">