Merge branch 'release/1.11.x' into release/1.12.x

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" />
 

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) {

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() {

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"

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"

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>

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>

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>