From adcc44660d16edb9cf2fe54d1dad6a882f0f5349 Mon Sep 17 00:00:00 2001
From: Philipp Woessner <64482866+pwoessner@users.noreply.github.com>
Date: Tue, 21 Jul 2020 16:13:36 +0200
Subject: [PATCH] Dev accessibility fixes (#902)
---
.../ui/submission/SubmissionTestResultFragment.kt | 3 ++-
.../src/main/res/layout/fragment_submission_test_result.xml | 3 +++
Corona-Warn-App/src/main/res/layout/include_submission_tan.xml | 1 +
.../src/main/res/layout/include_submission_test_result.xml | 2 ++
.../src/main/res/layout/include_test_result_card.xml | 1 +
Corona-Warn-App/src/main/res/values-de/strings.xml | 2 +-
6 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt
index 3f8dc9632..c20520ac2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragment.kt
@@ -127,7 +127,8 @@ class SubmissionTestResultFragment : Fragment() {
private fun setButtonOnClickListener() {
binding.submissionTestResultButtonPendingRefresh.setOnClickListener {
submissionViewModel.refreshDeviceUIState()
- binding.submissionTestResultContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT)
+ binding.submissionTestResultCard.submissionTestResultCard.testResultCard
+ .sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
binding.submissionTestResultButtonPendingRemoveTest.setOnClickListener {
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml
index c20b0c568..9e4c6acb5 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml
@@ -41,7 +41,10 @@
app:layout_constraintTop_toTopOf="parent" />
<include
+ android:id="@+id/submission_test_result_card"
layout="@layout/include_submission_test_result"
+ android:accessibilityLiveRegion="assertive"
+ android:importantForAccessibility="yes"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
android:layout_marginBottom="@dimen/button_padding_top_bottom"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_tan.xml b/Corona-Warn-App/src/main/res/layout/include_submission_tan.xml
index e1b02f87c..c4d3a8243 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_tan.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_tan.xml
@@ -40,6 +40,7 @@
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_large"
+ android:importantForAccessibility="no"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_tan_body" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml b/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml
index a479ec1cc..b6b15d563 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml
@@ -26,6 +26,8 @@
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
+ android:focusable="true"
+ android:importantForAccessibility="yes"
app:deviceUIState="@{submissionViewModel.deviceUiState}"
app:layout_constraintEnd_toEndOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
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 26fe1d9e9..dcdcdea37 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
@@ -17,6 +17,7 @@
</data>
<androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/test_result_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/card_dark"
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index 5fc9794c6..81be5d251 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -87,7 +87,7 @@
<!-- XACT: menu description for screen readers -->
<string name="accessibility_logo">"Corona-Warn-App"</string>
<!-- XACT: button description for screen readers to be appended at the end of content without focusable subcontent that are explored by touch -->
- <string name="accessibility_button">"Button"</string>
+ <string name="accessibility_button">"Taste"</string>
<!-- ####################################
Menu
--
GitLab