add last latest.apk ;)

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

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index d38adab..da8b7ba 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -18,64 +18,106 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
   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>
+    <PreferenceCategory
+               android:title="@string/prefs_category_accounts"
+               android:key="accounts_category">
+    </PreferenceCategory>

 
        <PreferenceCategory android:title="@string/prefs_category_security">
 
        <PreferenceCategory android:title="@string/prefs_category_security">

-               <!-- ListPreference
-            android:key="select_oc_account"
-            android:title="@string/prefs_select_oc_account"
-            android:summary="@string/prefs_summary_select_oc_account"
-            / -->
-               <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode"
-                       android:summary="@string/prefs_pincode_summary"/>
+               <android.preference.CheckBoxPreference android:title="@string/prefs_passcode" android:key="set_pincode" />

        </PreferenceCategory>
 
        </PreferenceCategory>
 

-       <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">
+         <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"
                <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"

-                       android:title="@string/prefs_instant_upload"
-                       android:summary="@string/prefs_instant_upload_summary"/>
-               <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: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: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:disableDependentsState="true"

-                       android:title="@string/instant_upload_on_wifi"
-                       android:key="instant_upload_on_wifi"/>
-               <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_video_uploading"
-                       android:title="@string/prefs_instant_video_upload"
-                       android:summary="@string/prefs_instant_video_upload_summary"/>
-               <EditTextPreference android:title="@string/prefs_instant_video_upload_path_title"
-                       android:defaultValue="@string/instant_upload_path"
-                       android:key="instant_video_upload_path"/>
-               <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:dependency="instant_video_uploading"
+                       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:disableDependentsState="true"

-                       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: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"/>
                        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:title="@string/prefs_instant_video_upload"
+               android:summary="@string/prefs_instant_video_upload_summary" />
+           <com.owncloud.android.ui.PreferenceWithLongSummary
+                       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
+                       android:dependency="instant_video_uploading"
+                       android:disableDependentsState="true"
+               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
                <!-- 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/common_category" android:key="common_category">
+               <EditTextPreference android:title="@string/pref_cache_size"
+                                                       android:key="pref_cache_size"
+                                                       android:digits="0123456789"/>

        </PreferenceCategory>
 
        <PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
        </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: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" />
-       </PreferenceCategory>
+       <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" />

 
 

+       <Preference android:id="@+id/changelog_link"
+               android:title="Changelog beta version"
+               android:key="changelog_link" />
+
+       </PreferenceCategory>

 </PreferenceScreen>
 </PreferenceScreen>