Merge branch 'develop' into regular_authentication_in_saml_server

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

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 78b89bb..a7f76f5 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -35,12 +35,22 @@
                                        android:disableDependentsState="true" 
                                        android:title="@string/instant_upload_on_wifi" 
                                        android:key="instant_upload_on_wifi"/>
                                        android:disableDependentsState="true" 
                                        android:title="@string/instant_upload_on_wifi" 
                                        android:key="instant_upload_on_wifi"/>

-    <CheckBoxPreference android:key="log_to_file" 
+    <!-- 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: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"/>
+                        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_imprint" android:key="imprint" />
+                        

        <Preference             android:id="@+id/about_app" 
                                        android:title="@string/about_title" 
                                        android:key="about_app" />
        <Preference             android:id="@+id/about_app" 
                                        android:title="@string/about_title" 
                                        android:key="about_app" />