changed according to latest discussion

[pub/Android/ownCloud.git] / res / xml / preferences.xml

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index ac36984..eb95bcd 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -22,17 +22,11 @@
     </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">
-         <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle 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"/>
          <com.owncloud.android.ui.PreferenceWithLongSummary
@@ -50,6 +44,14 @@
            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
                                                android:title="@string/instant_video_upload_on_wifi"
                                                android:key="instant_video_upload_on_wifi"/>
+               <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"
+                       />
            <!-- DISABLED FOR RELEASE UNTIL FIXED
            CheckBoxPreference android:key="log_to_file"
                                android:title="@string/prefs_log_title"