X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/802a1646160051a507853ef09e680139833fb142..4f7d416b81d42e26b7c36d673f76ddf460f4500e:/res/xml/preferences.xml

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 18cb398f..161bb666 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -22,16 +22,20 @@
     </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"
-	        / -->
-	    <android.preference.CheckBoxPreference android:title="@string/prefs_pincode" android:key="set_pincode" />
+	    <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"
+         <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