diff --git a/changelog/unreleased/4871 b/changelog/unreleased/4871
new file mode 100644
index 00000000000..fea65f1f46d
--- /dev/null
+++ b/changelog/unreleased/4871
@@ -0,0 +1,6 @@
+Enhancement: Passcode and pattern screens in landscape mode
+
+Orientation restrictions defined in the manifest have been removed, and support for both
+orientations (portrait and landscape) has been added to the passcode and pattern screens.
+
+https://github.com/owncloud/android/pull/4871
diff --git a/owncloudApp/src/main/AndroidManifest.xml b/owncloudApp/src/main/AndroidManifest.xml
index 8576ebf3229..73bf0a56ddf 100644
--- a/owncloudApp/src/main/AndroidManifest.xml
+++ b/owncloudApp/src/main/AndroidManifest.xml
@@ -187,7 +187,6 @@
diff --git a/owncloudApp/src/main/res/layout-land/activity_pattern_lock.xml b/owncloudApp/src/main/res/layout-land/activity_pattern_lock.xml
new file mode 100644
index 00000000000..0934cc4a6a0
--- /dev/null
+++ b/owncloudApp/src/main/res/layout-land/activity_pattern_lock.xml
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/owncloudApp/src/main/res/layout-land/passcodelock.xml b/owncloudApp/src/main/res/layout-land/passcodelock.xml
new file mode 100644
index 00000000000..80cf9836af1
--- /dev/null
+++ b/owncloudApp/src/main/res/layout-land/passcodelock.xml
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/owncloudApp/src/main/res/layout-w600dp/activity_pattern_lock.xml b/owncloudApp/src/main/res/layout-sw600dp/activity_pattern_lock.xml
similarity index 91%
rename from owncloudApp/src/main/res/layout-w600dp/activity_pattern_lock.xml
rename to owncloudApp/src/main/res/layout-sw600dp/activity_pattern_lock.xml
index cd23013026b..9ac3bb44ae1 100644
--- a/owncloudApp/src/main/res/layout-w600dp/activity_pattern_lock.xml
+++ b/owncloudApp/src/main/res/layout-sw600dp/activity_pattern_lock.xml
@@ -56,23 +56,23 @@
android:layout_marginTop="@dimen/standard_margin"
android:textColor="@color/warning"
android:textSize="16sp"
- app:layout_constraintBottom_toTopOf="@id/patternContainer"
+ app:layout_constraintBottom_toTopOf="@id/pattern_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/explanation_pattern" />
+ app:layout_constraintGuide_percent="0.3" />
+ app:layout_constraintGuide_percent="0.7" />
diff --git a/owncloudApp/src/main/res/layout-w600dp/passcodelock.xml b/owncloudApp/src/main/res/layout-sw600dp/passcodelock.xml
similarity index 96%
rename from owncloudApp/src/main/res/layout-w600dp/passcodelock.xml
rename to owncloudApp/src/main/res/layout-sw600dp/passcodelock.xml
index 24d517ad060..2e95cdea98b 100644
--- a/owncloudApp/src/main/res/layout-w600dp/passcodelock.xml
+++ b/owncloudApp/src/main/res/layout-sw600dp/passcodelock.xml
@@ -102,20 +102,20 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/passcode_margin_bottom"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@id/rightGuideline"
+ app:layout_constraintEnd_toEndOf="@id/right_guideline"
app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="@id/leftGuideline"
+ app:layout_constraintStart_toStartOf="@id/left_guideline"
app:layout_constraintTop_toBottomOf="@id/lock_time" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/owncloudApp/src/main/res/layout/activity_pattern_lock.xml b/owncloudApp/src/main/res/layout/activity_pattern_lock.xml
index d9689293b64..e2c9c8890de 100644
--- a/owncloudApp/src/main/res/layout/activity_pattern_lock.xml
+++ b/owncloudApp/src/main/res/layout/activity_pattern_lock.xml
@@ -51,12 +51,12 @@
android:layout_marginTop="@dimen/standard_margin"
android:textColor="@color/warning"
android:textSize="16sp"
- app:layout_constraintBottom_toTopOf="@id/patternContainer"
+ app:layout_constraintBottom_toTopOf="@id/pattern_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />