diff --git a/owncloudApp/src/main/java/com/owncloud/android/media/MediaControlView.java b/owncloudApp/src/main/java/com/owncloud/android/media/MediaControlView.java
index cdb065cdbc94..cbbb5e59b178 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/media/MediaControlView.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/media/MediaControlView.java
@@ -3,7 +3,8 @@
  *
  *   @author David A. Velasco
  *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   @author David González Verdugo
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
index 438cbebd766d..5953e0841404 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
@@ -3,7 +3,8 @@
  *
  *   @author David A. Velasco
  *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   @author David González Verdugo
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/GenericExplanationActivity.java
index 2c1708453c24..9ba1e4707f8c 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/GenericExplanationActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/GenericExplanationActivity.java
@@ -3,7 +3,8 @@
  *
  *   @author David A. Velasco
  *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   @author David González Verdugo
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java
index e3d1d5bdba32..43a6516ce006 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java
@@ -3,7 +3,8 @@
  *
  *   @author masensio
  *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   @author David González Verdugo
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java
index 1a3d2909a4ee..e8019f8b7877 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java
@@ -5,8 +5,9 @@
  *   @author masensio
  *   @author David A. Velasco
  *   @author Christian Schabesberger
+ *   @author David González Verdugo
  *   Copyright (C) 2011 Bartek Przybylski
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PrivacyPolicyActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PrivacyPolicyActivity.java
index d470bb90efb9..cdc3be126201 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PrivacyPolicyActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/PrivacyPolicyActivity.java
@@ -4,7 +4,7 @@
  *   @author David A. Velasco
  *   @author David González Verdugo
  *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
index ba1a3a76a4ef..c5f5640356f7 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -4,7 +4,8 @@
  *   @author David A. Velasco
  *   @author Shashvat Kedia
  *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   @author David González Verdugo
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -38,6 +39,7 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
index f659bc88b9ac..611b03a3d20f 100755
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ExpandableUploadListAdapter.java
@@ -4,7 +4,8 @@
  *  @author LukeOwncloud
  *  @author masensio
  *  @author Christian Schabesberger
- *  Copyright (C) 2018 ownCloud GmbH.
+ *  @author David González Verdugo
+ *  Copyright (C) 2019 ownCloud GmbH.
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2,
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.java b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.java
index b9f991157948..1e30a5293965 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.java
@@ -4,7 +4,8 @@
  *   @author Tobias Kaminsky
  *   @author Christian Schabesberger
  *   @author Shashvat Kedia
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   @author David González Verdugo
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -42,6 +43,7 @@
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.utils.MimetypeIconUtil;
+import com.owncloud.android.utils.PreferenceUtils;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/SharePublicLinkListAdapter.java b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/SharePublicLinkListAdapter.java
index 4e71561eae0d..fcd3a5ea1630 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/SharePublicLinkListAdapter.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/adapter/SharePublicLinkListAdapter.java
@@ -31,6 +31,7 @@
 
 import com.owncloud.android.R;
 import com.owncloud.android.lib.resources.shares.OCShare;
+import com.owncloud.android.utils.PreferenceUtils;
 
 import java.util.ArrayList;
 
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java
index 25fa5effe9d9..2872211d6641 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java
@@ -2,7 +2,8 @@
  *   ownCloud Android client application
  *
  *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   @author David González Verdugo
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -20,6 +21,7 @@
 package com.owncloud.android.ui.dialog;
 
 import com.owncloud.android.R;
+import com.owncloud.android.utils.PreferenceUtils;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorShowActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorShowActivity.java
index d222acb706ba..a929f1f9fca3 100755
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorShowActivity.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/errorhandling/ErrorShowActivity.java
@@ -3,17 +3,18 @@
  *
  * @author LukeOwncloud
  * @author Christian Schabesberger
- * Copyright (C) 2018 ownCloud GmbH.
- * <p>
+ * @author David González Verdugo
+ * Copyright (C) 2019 ownCloud GmbH.
+ *
  * 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.
- * <p>
+ *
  * 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.
- * <p>
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
index 6adb2ee8d577..983b9db1d81e 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/EditShareFragment.java
@@ -4,7 +4,8 @@
  *   @author masensio
  *   @author David A. Velasco
  *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   @author David González Verdugo
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 8dcdf355f810..32d535f6a876 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -4,8 +4,9 @@
  *   @author Bartek Przybylski
  *   @author David A. Velasco
  *   @author Christian Schabesberger
+ *   @author David González Verdugo
  *   Copyright (C) 2011  Bartek Przybylski
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -33,7 +34,9 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.owncloud.android.MainApp;
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 27ee4e1dfde3..3a72454f07f5 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -8,7 +8,7 @@
  *   @author David González Verdugo
  *   @author Shashvat Kedia
  *   Copyright (C) 2011  Bartek Przybylski
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -36,6 +36,7 @@
 import android.preference.PreferenceManager;
 import android.support.design.widget.BottomSheetBehavior;
 import android.support.design.widget.BottomSheetDialog;
+import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.Snackbar;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v4.widget.SwipeRefreshLayout;
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java
index db048b82f394..b2c7c3c0a396 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java
@@ -142,16 +142,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         (rootView.findViewById(R.id.cancelBtn)).setOnClickListener(this);
 
-        LinearLayout fileDownloadLL = getActivity().findViewById(R.id.fileDownloadLL);
-
-        fileDownloadLL.setFilterTouchesWhenObscured(
+        rootView.setFilterTouchesWhenObscured(
                 PreferenceUtils.shouldAllowTouchesWithOtherVisibleWindows(getContext())
         );
 
-        fileDownloadLL.setOnClickListener(v ->
-                ((PreviewImageActivity) getActivity()).toggleFullScreen()
-        );
-
         if (mError) {
             setButtonsForRemote(rootView);
         } else {
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.java b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.java
index ec4ebaeaa902..257944412bb3 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.java
+++ b/owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.java
@@ -3,7 +3,8 @@
  *
  *   @author David A. Velasco
  *   @author Christian Schabesberger
- *   Copyright (C) 2018 ownCloud GmbH.
+ *   @author David González Verdugo
+ *   Copyright (C) 2019 ownCloud GmbH.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -52,6 +53,7 @@
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.utils.DisplayUtils;
+import com.owncloud.android.utils.PreferenceUtils;
 
 
 /**
diff --git a/owncloudApp/src/main/java/com/owncloud/android/utils/PreferenceUtils.java b/owncloudApp/src/main/java/com/owncloud/android/utils/PreferenceUtils.java
new file mode 100644
index 000000000000..a5f50f1590b3
--- /dev/null
+++ b/owncloudApp/src/main/java/com/owncloud/android/utils/PreferenceUtils.java
@@ -0,0 +1,32 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author David González Verdugo
+ * Copyright (C) 2019 ownCloud GmbH.
+ *
+ * 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/>.
+ */
+
+package com.owncloud.android.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.owncloud.android.ui.activity.Preferences;
+
+public class PreferenceUtils {
+    public static boolean shouldAllowTouchesWithOtherVisibleWindows(Context context) {
+        SharedPreferences appPrefs = android.preference.PreferenceManager.getDefaultSharedPreferences(context);
+        return !appPrefs.getBoolean(Preferences.PREFERENCE_TOUCHES_WITH_OTHER_VISIBLE_WINDOWS, false);
+    }
+}
diff --git a/owncloudApp/src/main/res/layout/activity_privacy_policy.xml b/owncloudApp/src/main/res/layout/activity_privacy_policy.xml
index a008343871fb..ad5860f387c7 100644
--- a/owncloudApp/src/main/res/layout/activity_privacy_policy.xml
+++ b/owncloudApp/src/main/res/layout/activity_privacy_policy.xml
@@ -17,6 +17,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/activityPrivacyPolicyLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
diff --git a/owncloudApp/src/main/res/layout/alert_dialog_list_view.xml b/owncloudApp/src/main/res/layout/alert_dialog_list_view.xml
index 44d30d51dec2..562dfa63a964 100644
--- a/owncloudApp/src/main/res/layout/alert_dialog_list_view.xml
+++ b/owncloudApp/src/main/res/layout/alert_dialog_list_view.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/alertDialogListViewLayout"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:filterTouchesWhenObscured="true">
diff --git a/owncloudApp/src/main/res/layout/errorhandling_showerror.xml b/owncloudApp/src/main/res/layout/errorhandling_showerror.xml
index 56786badf12f..1eb262d4d274 100755
--- a/owncloudApp/src/main/res/layout/errorhandling_showerror.xml
+++ b/owncloudApp/src/main/res/layout/errorhandling_showerror.xml
@@ -1,6 +1,6 @@
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/errorHandlingShowErrorScrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
diff --git a/owncloudApp/src/main/res/layout/file_details_empty.xml b/owncloudApp/src/main/res/layout/file_details_empty.xml
index d0a9c01b4c5f..c34141aeaab8 100644
--- a/owncloudApp/src/main/res/layout/file_details_empty.xml
+++ b/owncloudApp/src/main/res/layout/file_details_empty.xml
@@ -17,6 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/fileDetailsEmptyLayout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
     android:background="@color/background_color"
diff --git a/owncloudApp/src/main/res/layout/file_download_fragment.xml b/owncloudApp/src/main/res/layout/file_download_fragment.xml
index bf50aeabd652..b3f83fe1175f 100644
--- a/owncloudApp/src/main/res/layout/file_download_fragment.xml
+++ b/owncloudApp/src/main/res/layout/file_download_fragment.xml
@@ -15,7 +15,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fileDownloadLL"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical" 
diff --git a/owncloudApp/src/main/res/layout/passcodelock.xml b/owncloudApp/src/main/res/layout/passcodelock.xml
index da853043c4a9..b2e1d48890d3 100644
--- a/owncloudApp/src/main/res/layout/passcodelock.xml
+++ b/owncloudApp/src/main/res/layout/passcodelock.xml
@@ -18,6 +18,7 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/passcodeLockLayout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="center_horizontal"
diff --git a/owncloudApp/src/main/res/layout/share_activity.xml b/owncloudApp/src/main/res/layout/share_activity.xml
index bf6edc38dcd6..5e47be46386c 100644
--- a/owncloudApp/src/main/res/layout/share_activity.xml
+++ b/owncloudApp/src/main/res/layout/share_activity.xml
@@ -18,6 +18,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/share_activity_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.owncloud.android.ui.activity.ShareActivity"