fixes after rebase

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

@@ -25,11 +25,9 @@ import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.design.widget.BottomNavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.view.View;
 
 import com.evernote.android.job.JobManager;
 import com.evernote.android.job.JobRequest;
@@ -38,8 +36,9 @@ import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.services.ContactsBackupJob;
-import com.owncloud.android.ui.fragment.contactsbackup.ContactsBackupFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
+import com.owncloud.android.ui.fragment.contactsbackup.ContactsBackupFragment;
+import com.owncloud.android.utils.DisplayUtils;
 
 import java.util.Set;
 
@@ -79,7 +78,6 @@ public class ContactsPreferenceActivity extends FileActivity implements FileFrag
         }
     }
 
-
     public static void startContactBackupJob(Account account) {
         Log_OC.d(TAG, "start daily contacts backup job");
 

src/main/res/layout/contacts_preference.xml

@@ -36,24 +36,15 @@
         <include
             layout="@layout/toolbar_standard"/>
 
-        <LinearLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/bottom_navigation_view"
             android:layout_below="@+id/appbar"
-            android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/contacts_header_backup"
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
             android:id="@+id/frame_container">
 
         </FrameLayout>
 
-        </LinearLayout>
-
         <android.support.design.widget.BottomNavigationView
             android:id="@+id/bottom_navigation_view"
             android:layout_width="match_parent"

src/main/res/values/setup.xml

@@ -86,7 +86,7 @@
     <bool name="videos_enabled">false</bool>
 
     <!-- Bottom toolbar -->
-    <bool name="bottom_toolbar_enabled">false</bool>
+    <bool name="bottom_toolbar_enabled">true</bool>
 
     <!-- Help, imprint and feedback, and other things -->
     <bool name="fingerprint_enabled">true</bool>