diff --git a/Corona-Warn-App/src/main/AndroidManifest.xml b/Corona-Warn-App/src/main/AndroidManifest.xml index e058ffe9572563a9836bc3a95bbd28d58ef59c67..f7f4cc3eef5107e5ab6ff333ecde6950b9bc5615 100644 --- a/Corona-Warn-App/src/main/AndroidManifest.xml +++ b/Corona-Warn-App/src/main/AndroidManifest.xml @@ -81,6 +81,7 @@ android:exported="false" android:screenOrientation="portrait" android:launchMode="singleTop" + android:label="@string/empty_string_to_avoid_toolbar_announcement" android:theme="@style/AppTheme.ContactDiary" android:windowSoftInputMode="adjustResize" /> diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt index 82b5775e5401e38f438399d8944f5e08b2417021..8f7cd9cc526fe839e26f3ecf37bb20e58fb897c0 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt @@ -4,6 +4,7 @@ import android.content.Context import androidx.lifecycle.asLiveData import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import de.rki.coronawarnapp.R import de.rki.coronawarnapp.contactdiary.ui.day.tabs.ContactDiaryDayTab import de.rki.coronawarnapp.contactdiary.util.getLocale import de.rki.coronawarnapp.contactdiary.util.toFormattedDay @@ -27,7 +28,8 @@ class ContactDiaryDayViewModel @AssistedInject constructor( val uiState = displayedDay.map { day -> UIState( dayText = { day.toFormattedDay(it.getLocale()) }, - dayTextContentDescription = { day.toFormattedDayForAccessibility(it.getLocale()) }) + dayTextContentDescription = { day.toFormattedDayForAccessibility(it.getLocale()) + + it.getString(R.string.accessibility_day_view_header) }) }.asLiveData() fun onCreateButtonClicked(activeTab: ContactDiaryDayTab) { diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragment.kt index 8cd7d7b1a7da2e1aab0f5d309621bef34567021d..4edfee1a4a158af5c9032ac4a3fc90680691df13 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragment.kt @@ -38,7 +38,7 @@ class SettingsBackgroundPriorityFragment : Fragment(R.layout.fragment_settings_b override fun onResume() { super.onResume() - binding.settingsBackgroundPriorityContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT) + binding.settingsBackgroundPriorityContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED) } private fun setButtonOnClickListener() { diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml index 215a15ab12efdac8ebf93df66bf8cf01de2c6f60..b00a8bde2e668726e502cf044d516c850689968b 100644 --- a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml +++ b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml @@ -15,6 +15,7 @@ android:layout_height="wrap_content" android:background="@drawable/contact_diary_background" android:elevation="@dimen/elevation_weak" + android:focusable="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" 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 d3b162defdbd627c69d4d58f82c440a16d621255..cb4c410114df6878889a7a376f6a81b06d299e19 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 @@ -12,7 +12,6 @@ android:id="@+id/settings_background_priority_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:contentDescription="@string/settings_background_priority_title" android:focusable="true"> <include @@ -20,6 +19,8 @@ layout="@layout/include_header" android:layout_width="0dp" android:layout_height="wrap_content" + android:contentDescription="@string/settings_background_priority_title" + android:focusable="true" app:icon="@{@drawable/ic_back}" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml b/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml index 91c98f4974dcc33fef59ff0ca27b4045bffde0ac..819bdd358ae9416838d697c52dcf772621a1d2c5 100644 --- a/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml +++ b/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml @@ -111,22 +111,24 @@ <string name="contact_diary_delete_person_title">"Wollen Sie wirklich diese Person entfernen?"</string> <!-- XTXT: location (description for screen readers) --> - <string name="accessibility_location">Ort %s</string> + <string name="accessibility_location">"Ort %s"</string> <!-- XTXT: person (description for screen readers) --> - <string name="accessibility_person">Person %s</string> + <string name="accessibility_person">"Person %s"</string> <!-- XTXT: location is not selected (description for screen readers) --> - <string name="accessibility_location_unselected">Ort %s ist nicht ausgewählt</string> + <string name="accessibility_location_unselected">"Ort %s ist nicht ausgewählt"</string> <!-- XTXT: person is not selected (description for screen readers) --> - <string name="accessibility_person_unselected">Person %s ist nicht ausgewählt</string> + <string name="accessibility_person_unselected">"Person %s ist nicht ausgewählt"</string> <!-- XTXT: location is selected (description for screen readers) --> - <string name="accessibility_location_selected">Ort %s ist ausgewählt</string> + <string name="accessibility_location_selected">"Ort %s ist ausgewählt"</string> <!-- XTXT: person is selected (description for screen readers) --> - <string name="accessibility_person_selected">Person %s ist ausgewählt</string> + <string name="accessibility_person_selected">"Person %s ist ausgewählt"</string> + <!-- XTXT: Day View headline (description for screen readers) --> + <string name="accessibility_day_view_header">"Tagesansicht"</string> <!-- XTXT: Select (description for screen readers) --> - <string name="accessibility_action_select">Auswählen</string> + <string name="accessibility_action_select">"Auswählen"</string> <!-- XTXT: Deselect (description for screen readers) --> - <string name="accessibility_action_deselect">Auswahl aufheben</string> + <string name="accessibility_action_deselect">"Auswahl aufheben"</string> <!-- XTXT: Edit (description for screen readers) --> - <string name="accessibility_edit">Bearbeiten</string> + <string name="accessibility_edit">"Bearbeiten"</string> </resources> diff --git a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml index 76e54bbec47b6ec1f27e1d42f47059cf7ac2ce99..6671b37dd501cb58321163fd7089d9461e146e3a 100644 --- a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml +++ b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml @@ -129,6 +129,8 @@ <string name="accessibility_location_selected">"Place %s is selected"</string> <!-- XTXT: person is selected (description for screen readers) --> <string name="accessibility_person_selected">"Person %s is selected"</string> + <!-- XTXT: Day View headline (description for screen readers) --> + <string name="accessibility_day_view_header"></string> <!-- XTXT: Select (description for screen readers) --> <string name="accessibility_action_select">"Select"</string> diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index 9ecd4f74af9d556d91ea5ce0a790d66f3d0ba1d2..e5f241e1362bb60fa455eb3758d205dc6ed5736c 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -1507,4 +1507,8 @@ <!-- XBUT: Abort button for test result positive no consent screen --> <string name="submission_test_result_positive_no_consent_button_abort">"Cancel"</string> + <!-- XTXT: Empty label for an activity --> + <string name="empty_string_to_avoid_toolbar_announcement" translatable="false">""</string> + + </resources>