X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/9593b580b72aaec969689eb4ca7197f8da736ab8..d1a06c2dd348c6ea2bd8da67b81c6c69597421ba:/res/xml/preferences.xml?ds=sidebyside

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3154c919..161bb666 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -22,11 +22,20 @@
     </PreferenceCategory>
     
 	<PreferenceCategory android:title="@string/prefs_category_security">
-	    <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