Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta

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

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3972e9e..e1876e9 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -31,15 +31,6 @@
        </PreferenceCategory>
 
     <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"/>
@@ -76,6 +67,14 @@
                        android:disableDependentsState="true"
                        android:title="@string/instant_video_upload_on_charging"
                        android:key="instant_video_upload_on_charging"/>
+               <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"
+                       />
        </PreferenceCategory>
 
        <PreferenceCategory android:title="@string/common_category" android:key="common_category">