diff --git a/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml
index 2277fe672d8fe4b98a599c31289f0bed4ad0c11e..dc52ad183c855b88927ce8f81eaa47d0f624d900 100644
--- a/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_fragment.xml
@@ -22,9 +22,8 @@
android:id="@+id/scrollview"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginBottom="12dp"
android:clipToPadding="false"
- android:paddingBottom="8dp"
+ android:paddingBottom="@dimen/spacing_normal"
app:layout_constraintBottom_toTopOf="@id/log_control_container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
index f849d27ac5a7955ca4a7a4c46931b9aad2382134..72bfa17005cd72bc5645155e10d221a8b56c88c9 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
@@ -58,7 +58,11 @@
android:id="@+id/locations_recycler_view"
android:layout_width="0dp"
android:layout_height="0dp"
- android:layout_margin="@dimen/spacing_normal"
+ android:layout_marginBottom="@dimen/spacing_normal"
+ android:paddingTop="@dimen/spacing_normal"
+ android:paddingHorizontal="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
android:importantForAccessibility="no"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
index b49af42225c281bb502c6cd21433f7fcebc1f02f..e58bf18b26d95cd7af8ceffafc57a420435a63f2 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
@@ -57,7 +57,11 @@
android:id="@+id/persons_recycler_view"
android:layout_width="0dp"
android:layout_height="0dp"
- android:layout_margin="@dimen/spacing_normal"
+ android:layout_marginBottom="@dimen/spacing_normal"
+ android:paddingTop="@dimen/spacing_normal"
+ android:paddingHorizontal="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
android:importantForAccessibility="no"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information.xml b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
index 25dfed9ca1d242afaa0acc5111e66759c8d63cd1..1fd3284d9b98cf9861372a0ffa1b6aecc9e50e96 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
@@ -26,8 +26,10 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:fillViewport="true"
- android:layout_marginTop="@dimen/spacing_normal"
- android:layout_marginBottom="@dimen/spacing_normal"
+ android:paddingTop="@dimen/spacing_normal"
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
index 5d5c89cfd12d23814ea839799d974a5d7c4c860d..cbc670c87dafce6a194073d268eed6e9512d67d2 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
@@ -24,7 +24,10 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_bottom"
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/information_about_header">
@@ -103,13 +106,6 @@
</ScrollView>
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/guideline_bottom" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
index 75163b421f29afa948d220349347a3c74e1ab7d4..968aa88b3461620ee41cdaf20ddb7ced87803f4a 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
@@ -24,7 +24,10 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_bottom"
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/information_contact_header">
@@ -152,13 +155,6 @@
</ScrollView>
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/guideline_bottom" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml
index acc309aed1edf4c6a7debc6f0a885e67fd848d3d..620ef558a39f452ac61f38f5fba2ae668925b9a0 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_legal.xml
@@ -31,9 +31,11 @@
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
- android:fillViewport="true"
android:focusable="true"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_bottom"
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/information_legal_header">
@@ -155,13 +157,6 @@
</ScrollView>
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/guideline_bottom" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_privacy.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_privacy.xml
index dd56b2ae00893e505474de3ae6ce8fdf17adda51..3fa2679625865a4a7d89de12d06782308a86315a 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_privacy.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_privacy.xml
@@ -30,7 +30,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
- android:paddingBottom="@dimen/guideline_bottom">
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay">
<include
android:id="@+id/information_privacy_header_details"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml
index 2cbf8db7f0ea002a329a34d864e31f44ac549590..2d648ab3d6bedc5e45b1281e73caa299ca072adc 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml
@@ -30,7 +30,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
- android:paddingBottom="@dimen/guideline_bottom">
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay">
<include
android:id="@+id/information_technical_header_details"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings.xml
index e80f31e3e0f6ca848e59ba75f3ca403dfa2c933e..48388cf2745a58fb247bc93d6ac7184f87decde3 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings.xml
@@ -43,7 +43,10 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_bottom"
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings_header">
@@ -158,13 +161,6 @@
</ScrollView>
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/guideline_bottom" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_background_priority.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_background_priority.xml
index cb4c410114df6878889a7a376f6a81b06d299e19..b3a12bb191abaa9325bacb7c94c9a710e90ed00a 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_background_priority.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_background_priority.xml
@@ -31,7 +31,10 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_bottom"
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings_background_priority_header">
@@ -120,13 +123,6 @@
</ScrollView>
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/guideline_bottom" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
index f2a5f0f15f992c625cf64c554ba0a700fe76cc24..f97962270f1d8305cd082be0e9b76bbf5ce632c0 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
@@ -32,7 +32,10 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_bottom"
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings_notifications_header">
@@ -120,13 +123,6 @@
</ScrollView>
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/guideline_bottom" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml
index 21731d367ee1d3f4849102e6fe107334e371ba31..b158a7869eea4a58699eae92cbd43eb8e416905d 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml
@@ -27,7 +27,10 @@
android:id="@+id/scrollview"
android:layout_width="0dp"
android:layout_height="0dp"
- app:layout_constraintBottom_toTopOf="@+id/guideline_bottom"
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/settings_ppa_header">
@@ -377,33 +380,5 @@
</ScrollView>
- <androidx.constraintlayout.widget.Guideline
- android:id="@id/guideline_top"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_begin="@dimen/guideline_top" />
-
- <androidx.constraintlayout.widget.Guideline
- android:id="@id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/spacing_small" />
-
- <androidx.constraintlayout.widget.Guideline
- android:id="@id/guideline_start"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_begin="@dimen/guideline_start" />
-
- <androidx.constraintlayout.widget.Guideline
- android:id="@id/guideline_end"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintGuide_end="@dimen/guideline_end" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml b/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
index 3a77158151f358e1e8e26e462e67c80f7fdaef76..082aa18e15213023e746986a0d2735bad6b20ecd 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
@@ -93,7 +93,10 @@
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
- app:layout_constraintBottom_toBottomOf="@id/guideline_bottom"
+ android:paddingBottom="@dimen/spacing_normal"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
@@ -426,9 +429,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_start"
- android:layout_marginTop="24dp"
+ android:layout_marginTop="@dimen/spacing_normal"
android:layout_marginEnd="@dimen/guideline_end"
- android:layout_marginBottom="23dp"
android:contentDescription="@string/statistics_explanation_trend_description"
android:focusable="true"
android:text="@string/statistics_explanation_trend_description" />
@@ -437,13 +439,6 @@
</ScrollView>
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/guideline_bottom" />
-
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml b/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
index fd7e77dd2b97a4de774bf6831549a61990609b76..d86a5a7de4b057adcb9d0cd8756c793e75343d38 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
@@ -20,9 +20,10 @@
style="@style/buttonPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="24dp"
- android:layout_marginBottom="24dp"
+ android:layout_marginHorizontal="@dimen/spacing_normal"
+ android:layout_marginVertical="@dimen/spacing_small"
android:text="@string/trace_location_onboarding_body_confirm"
+ app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_scroll_view"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
@@ -31,7 +32,9 @@
android:id="@+id/check_in_onboarding_scroll_view"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginBottom="20dp"
+ android:paddingBottom="@dimen/spacing_small"
+ android:clipToPadding="false"
+ android:scrollbarStyle="outsideOverlay"
app:layout_constraintBottom_toTopOf="@+id/check_in_onboarding_acknowledge"
app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_toolbar">