X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/9dd2cf294a5bd8427d344833f0098a1ab6800c98..9969330cbf02e952779d5f60f192c7503ca2b8aa:/res/xml/preferences.xml

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index c38123ce..4f6416ee 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,13 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012  Bartek Przybylski
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  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_general">
     
-    <ListPreference
+    <!-- ListPreference
         android:key="select_oc_account"
         android:title="@string/prefs_select_oc_account"
         android:summary="@string/prefs_summary_select_oc_account" 
-        />
-    <CheckBoxPreference android:key="instant_uploading" android:title="Enable instant uploading" android:summary="Instantly upload photos taken by camera"/>
+        / -->
+    <Preference android:title="@string/prefs_manage_accounts" android:key="manage_account" />
+    <CheckBoxPreference android:title="@string/prefs_pincode" android:key="set_pincode" 
+                        android:summary="@string/prefs_pincode_summary"/>
+    <CheckBoxPreference android:key="instant_uploading" 
+                        android:title="@string/prefs_instant_upload"  
+                        android:summary="@string/prefs_instant_upload_summary"/>
+    <CheckBoxPreference android:dependency="instant_uploading" 
+        				android:disableDependentsState="true" 
+        				android:title="@string/instant_upload_on_wifi" 
+        				android:key="instant_upload_on_wifi"/>
+    <!-- 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:id="@+id/about_app" 
+        				android:title="@string/about_title" 
+        				android:key="about_app" />
 	</PreferenceCategory>