Merge pull request #866 from nextcloud/branding-options

Tweak davdroid config option

src/main/java/com/owncloud/android/ui/activity/Preferences.java

@@ -243,7 +243,7 @@ public class Preferences extends PreferenceActivity
 
         PreferenceCategory preferenceCategoryMore = (PreferenceCategory) findPreference("more");
 
-        boolean calendarContactsEnabled = getResources().getBoolean(R.bool.calendar_contacts_enabled);
+        boolean calendarContactsEnabled = getResources().getBoolean(R.bool.davdroid_integration_enabled);
         Preference pCalendarContacts = findPreference("calendar_contacts");
         if (pCalendarContacts != null) {
             if (calendarContactsEnabled) {

src/main/res/values/setup.xml

@@ -87,9 +87,9 @@
     <!-- Bottom toolbar -->
     <bool name="bottom_toolbar_enabled">false</bool>
 
-    <!-- Help, imprint and feedback -->
+    <!-- Help, imprint and feedback, and other things -->
     <bool name="fingerprint_enabled">true</bool>
-    <bool name="calendar_contacts_enabled">true</bool>
+    <bool name="davdroid_integration_enabled">true</bool>
     <bool name="help_enabled">true</bool>
     <bool name="imprint_enabled">false</bool> 
     <bool name="recommend_enabled">true</bool>

src/modified/res/values/setup.xml

@@ -86,7 +86,7 @@
 
     <!-- Help, imprint and feedback -->
     <bool name="fingerprint_enabled">true</bool>
-    <bool name="calendar_contacts_enabled">true</bool>
+    <bool name="davdroid_integration_enabled">true</bool>
     <bool name="help_enabled">true</bool>
     <bool name="imprint_enabled">false</bool> 
     <bool name="recommend_enabled">true</bool>