Merge branch 'develop' into videoInstandUploads

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

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index a7f76f5..4c6ee40 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -25,13 +25,13 @@
         android:title="@string/prefs_select_oc_account"
         android:summary="@string/prefs_summary_select_oc_account" 
         / -->
         android:title="@string/prefs_select_oc_account"
         android:summary="@string/prefs_summary_select_oc_account" 
         / -->

-    <Preference android:title="@string/prefs_manage_accounts" android:key="manage_account" />
-    <CheckBoxPreference android:title="@string/prefs_pincode" android:key="set_pincode" 
+    <com.owncloud.android.ui.PreferenceMultiline android:title="@string/prefs_manage_accounts" android:key="manage_account" />
+    <com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:title="@string/prefs_pincode" android:key="set_pincode" 

                         android:summary="@string/prefs_pincode_summary"/>
                         android:summary="@string/prefs_pincode_summary"/>

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

-    <CheckBoxPreference android:dependency="instant_uploading" 
+    <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"/>
                                        android:disableDependentsState="true" 
                                        android:title="@string/instant_upload_on_wifi" 
                                        android:key="instant_upload_on_wifi"/>