merged PR 1111 animatedGif

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

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index ff711ea..5c853fe 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -35,49 +35,56 @@
 
     <PreferenceCategory android:title="@string/prefs_category_instant_uploading"
                android:key="instant_uploading_category">
 
     <PreferenceCategory android:title="@string/prefs_category_instant_uploading"
                android:key="instant_uploading_category">

-           <EditTextPreference android:title="@string/prefs_instant_upload_path_title"
-                                               android:defaultValue="@string/instant_upload_path"
-                                               android:key="instant_upload_path"/>
-           <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-                       android:dependency="instant_uploading"
-                                       android:disableDependentsState="true"
-                                       android:title="@string/instant_upload_on_charging"
-                                       android:key="instant_upload_on_charging"/>
+

            <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
-                                                       android:title="@string/prefs_instant_upload_path_title"
-                                                       android:key="instant_upload_path" />
-           <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
-                                               android:title="@string/instant_upload_on_wifi"
-                                               android:key="instant_upload_on_wifi"/>
+               android:title="@string/prefs_instant_upload"
+               android:summary="@string/prefs_instant_upload_summary"/>
+               <com.owncloud.android.ui.PreferenceWithLongSummary
+                       android:dependency="instant_uploading"
+                       android:disableDependentsState="true"
+                       android:title="@string/prefs_instant_upload_path_title"
+                       android:key="instant_upload_path" />

            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle

+                       android:dependency="instant_uploading"
+                       android:disableDependentsState="true"
+               android:title="@string/instant_upload_on_wifi"
+               android:key="instant_upload_on_wifi"/>
+               <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
+                       android:dependency="instant_uploading"
+                       android:disableDependentsState="true"
+                       android:title="@string/instant_upload_on_charging"
+                       android:key="instant_upload_on_charging"/>
+
+               <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle

                        android:key="instant_video_uploading"
                        android:key="instant_video_uploading"

-                               android:title="@string/prefs_instant_video_upload"
-                               android:summary="@string/prefs_instant_video_upload_summary" />
+               android:title="@string/prefs_instant_video_upload"
+               android:summary="@string/prefs_instant_video_upload_summary" />

            <com.owncloud.android.ui.PreferenceWithLongSummary
            <com.owncloud.android.ui.PreferenceWithLongSummary

-                                                       android:title="@string/prefs_instant_video_upload_path_title"
-                                                       android:key="instant_video_upload_path" />
+                       android:dependency="instant_video_uploading"
+                       android:disableDependentsState="true"
+                       android:title="@string/prefs_instant_video_upload_path_title"
+                       android:key="instant_video_upload_path" />

            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
            <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle

-                                               android:title="@string/instant_video_upload_on_wifi"
-                                               android:key="instant_video_upload_on_wifi"/>
-               <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_uploading"
+                       android:dependency="instant_video_uploading"

                        android:disableDependentsState="true"
                        android:disableDependentsState="true"

-                       android:title="@string/instant_upload_on_charging"
-                       android:key="instant_upload_on_charging"/>
-           <!-- DISABLED FOR RELEASE UNTIL FIXED
+               android:title="@string/instant_video_upload_on_wifi"
+               android:key="instant_video_upload_on_wifi"/>
+               <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
+                       android:dependency="instant_video_uploading"
+                       android:disableDependentsState="true"
+                       android:title="@string/instant_video_upload_on_charging"
+                       android:key="instant_video_upload_on_charging"/>
+       </PreferenceCategory>
+       
+       <PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
+               <!-- DISABLED FOR RELEASE UNTIL FIXED

            CheckBoxPreference android:key="log_to_file"
                                android:title="@string/prefs_log_title"
                                android:summary="@string/prefs_log_summary"/>
                <Preference             android:key="log_history"
                                android:title="@string/prefs_log_title_history"
                                android:summary="@string/prefs_log_summary_history"/ -->
            CheckBoxPreference android:key="log_to_file"
                                android:title="@string/prefs_log_title"
                                android:summary="@string/prefs_log_summary"/>
                <Preference             android:key="log_history"
                                android:title="@string/prefs_log_title_history"
                                android:summary="@string/prefs_log_summary_history"/ -->

-                        
-    </PreferenceCategory>
-       
-       <PreferenceCategory android:title="@string/prefs_category_more" android:key="more">

                <Preference android:title="@string/prefs_help" android:key="help" />
                <Preference android:title="@string/prefs_recommend" android:key="recommend" />
                <Preference android:title="@string/prefs_feedback" android:key="feedback" />
                <Preference android:title="@string/prefs_help" android:key="help" />
                <Preference android:title="@string/prefs_recommend" android:key="recommend" />
                <Preference android:title="@string/prefs_feedback" android:key="feedback" />