BugFix for #1312 - setting ListPreference selection on pre kitkat

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

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3154c91..161bb66 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -22,11 +22,20 @@
     </PreferenceCategory>
     
        <PreferenceCategory android:title="@string/prefs_category_security">
     </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">
        </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
                                android:title="@string/prefs_instant_upload"
                                android:summary="@string/prefs_instant_upload_summary"/>
          <com.owncloud.android.ui.PreferenceWithLongSummary