X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ee25589d707182cdf280cf7730f3c4c94a41d664..ea760bad448c79cc747faee7c3e3f56481fc62f2:/res/xml/preferences.xml

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 842579bb..da8b7bac 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -22,20 +22,27 @@
 		android:title="@string/prefs_category_accounts"
 		android:key="accounts_category">
     </PreferenceCategory>
-    
+
 	<PreferenceCategory android:title="@string/prefs_category_security">
-		<!-- 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.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode"
-			android:summary="@string/prefs_pincode_summary"/>
+		<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">
+    <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
+         <com.owncloud.android.ui.dialog.OwnCloudListPreference android:key="prefs_instant_behaviour"
+			 android:dialogTitle="@string/prefs_instant_behaviour_dialogTitle"
+			 android:title="@string/prefs_instant_behaviour_title"
+			 android:entries="@array/pref_behaviour_entries"
+			 android:entryValues="@array/pref_behaviour_entryValues"
+			 android:defaultValue="NOTHING"
+			 android:summary="%s"
+			 />
 
+		<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:key="instant_uploading"
 	        android:title="@string/prefs_instant_upload"
@@ -99,11 +106,18 @@
     <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" 
+
+	<Preference 		android:id="@+id/about_app"
+        				android:title="@string/about_title"
         				android:key="about_app" />
-	</PreferenceCategory>
 
+	<Preference android:id="@+id/beta_link"
+				android:title="Download latest beta version"
+				android:key="beta_link" />
+
+	<Preference android:id="@+id/changelog_link"
+		android:title="Changelog beta version"
+		android:key="changelog_link" />
 
+	</PreferenceCategory>
 </PreferenceScreen>