test for fdroid

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

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 29e8fe2..3972e9e 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -18,9 +18,12 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-    <PreferenceCategory
-               android:title="@string/prefs_category_accounts"
-               android:key="accounts_category">
+       <PreferenceCategory android:title="@string/prefs_category_general">
+               <com.owncloud.android.ui.PreferenceWithLongSummary
+                       android:title="@string/prefs_storage_path"
+                       android:key="storage_path" />
+       </PreferenceCategory>
+    <PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">
     </PreferenceCategory>
 
        <PreferenceCategory android:title="@string/prefs_category_security">
@@ -44,15 +47,6 @@
                                                        android:title="@string/prefs_instant_upload_path_title"
                                                        android:key="instant_upload_path" />
            <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:dependency="instant_uploading"
-                       android:disableDependentsState="true"
-                       android:title="@string/prefs_instant_upload_path_title"
-                       android:key="instant_upload_path" />
-           <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle
                        android:dependency="instant_uploading"
                        android:disableDependentsState="true"
                android:title="@string/instant_upload_on_wifi"
@@ -83,17 +77,6 @@
                        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"/ -->
-                        
-    </PreferenceCategory>
 
        <PreferenceCategory android:title="@string/common_category" android:key="common_category">
                <EditTextPreference android:title="@string/pref_cache_size"
@@ -102,19 +85,29 @@
        </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"/ -->
     <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_imprint" android:key="imprint" />
-                        
-       <Preference             android:id="@+id/about_app" 
-                                       android:title="@string/about_title" 
+
+       <Preference             android:id="@+id/about_app"
+                                       android:title="@string/about_title"
                                        android:key="about_app" />
 
        <Preference android:id="@+id/beta_link"
                                android:title="Download latest beta version"
                                android:key="beta_link" />
-       </PreferenceCategory>
 
+       <Preference android:id="@+id/changelog_link"
+               android:title="Changelog beta version"
+               android:key="changelog_link" />
 
+       </PreferenceCategory>
 </PreferenceScreen>