X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/65f403bf994bd84d64eea16072b7bec479c0d525..65c7d5d5baf3455d02b4a7d9352fcd42d939c669:/res/xml/preferences.xml?ds=sidebyside

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 78b89bb6..69b4b284 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -25,22 +25,39 @@
         android:title="@string/prefs_select_oc_account"
         android:summary="@string/prefs_summary_select_oc_account" 
         / -->
-    <Preference android:title="@string/prefs_manage_accounts" android:key="manage_account" />
-    <CheckBoxPreference android:title="@string/prefs_pincode" android:key="set_pincode" 
+    <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"/>
-    <CheckBoxPreference android:key="instant_uploading" 
+    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading" 
                         android:title="@string/prefs_instant_upload"  
                         android:summary="@string/prefs_instant_upload_summary"/>
-    <CheckBoxPreference android:dependency="instant_uploading" 
+    <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"/>
-    <CheckBoxPreference android:key="log_to_file" 
+    <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"/>
+                        android:summary="@string/prefs_log_summary_history"/ -->
+                        
+    </PreferenceCategory>
+	
+	<PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
+    <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" />
+    <Preference android:title="@string/prefs_imprint" android:key="imprint" />
+                        
 	<Preference 		android:id="@+id/about_app" 
         				android:title="@string/about_title" 
         				android:key="about_app" />