diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml b/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
index 4805cd6cdca51d2d71ce2613eb807c4c439b428e..8cc2ca342e4f94da7bbdef339effe5e7b0da1774 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
@@ -93,10 +93,10 @@
<TextView
style="@style/headline6"
- android:accessibilityHeading="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_body_title"
+ android:accessibilityHeading="true"
android:text="@string/main_overview_subtitle_risk_levels"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -174,10 +174,10 @@
<TextView
style="@style/headline5"
- android:accessibilityHeading="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_body_title"
+ android:accessibilityHeading="true"
android:text="@string/main_overview_headline_glossary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
index 00cfdb750cd472931e3885bb962da9bac1be79aa..0cfb4d8f442bf43a51251bdda27219865c71ec95 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
@@ -9,6 +9,8 @@
<import type="de.rki.coronawarnapp.util.formatter.FormatterRiskHelper" />
+ <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
+
<import type="android.view.View" />
<variable
@@ -49,7 +51,7 @@
style="@style/icon"
android:layout_width="@dimen/icon_size_button"
android:layout_height="@dimen/icon_size_button"
- android:contentDescription="@{@string/accessibility_back}"
+ android:contentDescription="@{FormatterAccessibilityHelper.formatButton(@string/accessibility_back)}"
android:src="@{@drawable/ic_close}"
android:tint="@{FormatterRiskHelper.formatStableTextColor(tracingViewModel.riskLevel)}"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml
index 8d9f69c28255022df5873adf3fdaf8e115eb5476..f39dd6998635cf8e91a74ec18bb209b68d512d67 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml
@@ -2,6 +2,12 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
+ <data>
+
+ <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
+
+ </data>
+
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/submission_qr_code_scan_container"
android:contentDescription="@string/submission_qr_code_scan_title"
@@ -68,7 +74,7 @@
style="@style/iconStable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:contentDescription="@string/accessibility_close"
+ android:contentDescription="@{FormatterAccessibilityHelper.formatImage(@string/accessibility_close)"
android:src="@drawable/ic_close"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_button_icon.xml b/Corona-Warn-App/src/main/res/layout/include_button_icon.xml
index ec8918be59f54efd5514830d99519e7666f88329..f98fe479383d1b536e2ddb6e049fc6ae2550235a 100644
--- a/Corona-Warn-App/src/main/res/layout/include_button_icon.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_button_icon.xml
@@ -21,6 +21,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/button_icon"
style="@style/buttonIcon"
+ android:contentDescription="@{FormatterAccessibilityHelper.formatButton(iconDescription)}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
@@ -31,7 +32,7 @@
android:layout_width="@dimen/icon_size_button"
android:layout_height="@dimen/icon_size_button"
android:src="@{icon}"
- android:contentDescription="@{FormatterAccessibilityHelper.formatButton(iconDescription)}"
+ android:importantForAccessibility="no"
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/include_dispatcher_card.xml b/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml
index e4d12d5ea4663d94cc06941e44c41c7416972103..d0a348e06abe21d86ffe8d6e001429b0899626fa 100644
--- a/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml
@@ -5,6 +5,8 @@
<data>
+ <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
+
<variable
name="headline"
type="String" />
@@ -50,6 +52,7 @@
android:layout_marginEnd="@dimen/spacing_normal"
android:src="@drawable/ic_forward"
android:tint="@color/colorTextPrimary1"
+ android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -63,6 +66,7 @@
android:layout_marginEnd="@dimen/spacing_small"
android:layout_marginBottom="@dimen/spacing_normal"
android:text="@{body}"
+ android:contentDescription="@{FormatterAccessibilityHelper.formatButton(body)}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/dispatcher_card_illustration"
app:layout_constraintStart_toStartOf="parent"
@@ -76,6 +80,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/button_icon_margin"
android:src="@{illustration}"
+ android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dispatcher_card_icon"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
index 110933b75e570ae96415290e579d72997ee575ea..86fa23f9c3917f8209161d944b8332ddb9b8d259 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
@@ -2,6 +2,12 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
+ <data>
+
+ <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
+
+ </data>
+
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -15,7 +21,7 @@
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:src="@drawable/ic_submission_illustration_hotline"
- android:contentDescription="@string/information_contact_illustration_description"
+ android:contentDescription="@{FormatterAccessibilityHelper.formatImage(@string/information_contact_illustration_description)}"
android:focusable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_done.xml b/Corona-Warn-App/src/main/res/layout/include_submission_done.xml
index a3cdc8db715641cead330afbc8789deba05402b1..811b74fdb96ea3022ea535b42d1eb74a47d9df21 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_done.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_done.xml
@@ -2,6 +2,12 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
+ <data>
+
+ <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
+
+ </data>
+
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -15,7 +21,7 @@
android:id="@+id/submission_done_hero_illustration"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:contentDescription="@string/submission_done_illustration_description"
+ android:contentDescription="@{FormatterAccessibilityHelper.formatImage(@string/submission_done_illustration_description)}"
android:focusable="true"
android:src="@drawable/ic_submission_illustration_thanks"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml b/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml
index 47cca7183e2a4b7808e7340b29dc22a89c376918..2819f84a4a6a644c766f949943b5ee6d4f6a8ebc 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml
@@ -2,6 +2,12 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
+ <data>
+
+ <import type="de.rki.coronawarnapp.util.formatter.FormatterAccessibilityHelper" />
+
+ </data>
+
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -12,7 +18,7 @@
<ImageView
android:id="@+id/submission_intro_hero_illustration"
- android:contentDescription="@{@string/submission_intro_illustration_description}"
+ android:contentDescription="@{FormatterAccessibilityHelper.formatImage(@string/submission_intro_illustration_description)}"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:src="@drawable/ic_illustration_test"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_content.xml b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_content.xml
index 9bb43b3cf3ecf32bdd41f5d1116500b6091f9088..e66130292fa770caf7500732e80a309354ccce92 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_content.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_content.xml
@@ -94,6 +94,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@{FormatterSubmissionHelper.formatSubmissionStatusCardContentIcon(deviceUIState)}"
+ android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/submission_status_card_content_title"
tools:src="@drawable/ic_main_illustration_negative" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_unregistered.xml b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_unregistered.xml
index 01fa72d8dce354cee9c0921f98f60209ef396e59..bdece7afdf31a9d7edfc2ca41a78ab1f7daa3fae 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_status_card_unregistered.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_status_card_unregistered.xml
@@ -59,6 +59,7 @@
android:id="@+id/submission_status_card_unregistered_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/submission_status_card_unregistered_title"
app:srcCompat="@drawable/ic_main_illustration_untested" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_test_result_card.xml b/Corona-Warn-App/src/main/res/layout/include_test_result_card.xml
index 7e2140709a73eff44a30fcee1600e4b6bf0a1f08..26fe1d9e97601633d2150b65994e6e802f08fd56 100644
--- a/Corona-Warn-App/src/main/res/layout/include_test_result_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_test_result_card.xml
@@ -54,6 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@{FormatterSubmissionHelper.formatTestStatusIcon(deviceUIState)}"
+ android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_test_result_illustration_negative" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_test_result_card_positive.xml b/Corona-Warn-App/src/main/res/layout/include_test_result_card_positive.xml
index 23a5b5500c460d725df85274a34b0944e4ee856c..0b91e0f511903d98a7a3f33cdac7b738d5fd1c7c 100644
--- a/Corona-Warn-App/src/main/res/layout/include_test_result_card_positive.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_test_result_card_positive.xml
@@ -25,6 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_test_result_illustration_positive_card"
+ android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_test_result_illustration_positive" />
diff --git a/Corona-Warn-App/src/main/res/layout/view_bullet_point_entry.xml b/Corona-Warn-App/src/main/res/layout/view_bullet_point_entry.xml
index ffdcf0ce6a0c7c2ee426a887e5bd06a677d9b5cd..122002ebd47f2967d93de22ad81f942a7b2acb3f 100644
--- a/Corona-Warn-App/src/main/res/layout/view_bullet_point_entry.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_bullet_point_entry.xml
@@ -13,6 +13,7 @@
android:layout_marginStart="@dimen/bullet_point_spacing_before"
android:baseline="@dimen/bullet_point_baseline_offset"
android:src="@drawable/bullet_point"
+ android:importantForAccessibility="no"
app:layout_constraintBaseline_toBaselineOf="@+id/bullet_point_content"
app:layout_constraintStart_toStartOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml b/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml
index bad4a5a8fb9a1071bfdc0f3732bac0eca09dd405..2f921781b7e3c791d7de45df25c5f49c6d4aa06b 100644
--- a/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml
@@ -20,7 +20,7 @@
android:id="@+id/circle_progress_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:contentDescription="Sie haben alle tage erfasst"
+ android:importantForAccessibility="no"
android:src="@drawable/ic_risk_card_saved_days"
android:tint="@color/colorAccentTintIcon"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/view_step_entry.xml b/Corona-Warn-App/src/main/res/layout/view_step_entry.xml
index ee490f1cbdd737c30333923efa14efdaa45d5bea..d44360dd792ff6121dc36a5332878277ad6ffaa0 100644
--- a/Corona-Warn-App/src/main/res/layout/view_step_entry.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_step_entry.xml
@@ -11,6 +11,7 @@
android:id="@+id/step_entry_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_main_overview_1" />