X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/37df675ca3b8275293dfdfcd1b166ebcf831232f..0c3476a98206347b380d8152cfec4581ee2dc3ff:/res/xml/preferences.xml

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index d38adabb..5c853fe4 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -18,9 +18,11 @@
   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_accounts" android:key="accounts_category">
-	</PreferenceCategory>
-
+    <PreferenceCategory
+		android:title="@string/prefs_category_accounts"
+		android:key="accounts_category">
+    </PreferenceCategory>
+    
 	<PreferenceCategory android:title="@string/prefs_category_security">
 		<!-- ListPreference
             android:key="select_oc_account"
@@ -31,42 +33,58 @@
 			android:summary="@string/prefs_pincode_summary"/>
 	</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"/>
-		<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:dependency="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.PreferenceWithLongSummary
+			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"/>
-		<EditTextPreference android:title="@string/prefs_instant_video_upload_path_title"
-			android:defaultValue="@string/instant_upload_path"
-			android:key="instant_video_upload_path"/>
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_video_uploading"
+			android:title="@string/prefs_instant_upload_path_title"
+			android:key="instant_upload_path" />
+	    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
+			android:dependency="instant_uploading"
 			android:disableDependentsState="true"
-			android:title="@string/instant_video_upload_on_wifi"
-			android:key="instant_video_upload_on_wifi"/>
-		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading"
+	        android:title="@string/instant_upload_on_wifi"
+	        android:key="instant_upload_on_wifi"/>
+		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
+			android:dependency="instant_uploading"
 			android:disableDependentsState="true"
 			android:title="@string/instant_upload_on_charging"
 			android:key="instant_upload_on_charging"/>
-		<!-- 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"/ -->
 
+		<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:dependency="instant_video_uploading"
+			android:disableDependentsState="true"
+			android:title="@string/prefs_instant_video_upload_path_title"
+			android:key="instant_video_upload_path" />
+	    <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"/>
+		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
+			android:dependency="instant_video_uploading"
+			android:disableDependentsState="true"
+			android:title="@string/instant_video_upload_on_charging"
+			android:key="instant_video_upload_on_charging"/>
 	</PreferenceCategory>
-
+	
 	<PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
+		<!-- 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"/ -->
 		<Preference android:title="@string/prefs_help" android:key="help" />
 		<Preference android:title="@string/prefs_recommend" android:key="recommend" />
 		<Preference android:title="@string/prefs_feedback" android:key="feedback" />