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 3f8dc9632ff942d9d255dd10caa63e7832d2e694..c20520ac2e19598aad52702abd6d8dc54bab2cf9 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 c20b0c5689108648b759031b7c4de4046c2ee56b..9e4c6acb51529292c042d8a0963fe3717ad4c4b5 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 e1b02f87c6ae918d87c68cd9ab4e288b091044e6..c4d3a8243d0c1005b0c8069bfaeb76f382473c91 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 a479ec1ccef516e263981980d36a0670e4e3f91f..b6b15d563c317d0d90058b10c1f10e64fd260c5b 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 26fe1d9e97601633d2150b65994e6e802f08fd56..dcdcdea37b799ecb255d0e23b0b3d68d0499f0ad 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 5fc9794c6dd3287348c64eb6a9b84fcea5b0b7da..81be5d25188cc93efcf37e9c0a7c50769ad0d299 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