diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
index 897dd2d86d3b526666892ada4b073d0c2182df60..0abb8c24510e87802c155fbdebb7770862503846 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
@@ -105,7 +105,7 @@ class MainActivity : AppCompatActivity(), HasAndroidInjector {
R.string.onboarding_energy_optimized_dialog_button_negative,
false, {
// go to battery optimization
- startActivitySafely(powerManagement.disableBatteryOptimizationsIntent)
+ startActivitySafely(powerManagement.toBatteryOptimizationSettingsIntent)
}, {
// keep battery optimization enabled
showManualCheckingRequiredDialog()
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsBackgroundPriorityFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsBackgroundPriorityFragment.kt
index e5c40a8477b6576e7ec2bfc0060fd17d8b7d131e..6092d9cf4290e09e52a2a808de8a65d8bb73f766 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsBackgroundPriorityFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsBackgroundPriorityFragment.kt
@@ -38,19 +38,12 @@ class SettingsBackgroundPriorityFragment :
}
private fun setButtonOnClickListener() {
- val switch = binding.settingsSwitchRowBackgroundPriority.settingsSwitchRowSwitch
- val switchRow = binding.settingsSwitchRowBackgroundPriority.settingsSwitchRow
+ val settingsRow = binding.settingsRowBackgroundPriority
// enable background priority
- setOf(switch, switchRow).forEach {
- it.setOnClickListener {
- val isPriorityEnabled = settingsViewModel.isBackgroundPriorityEnabled.value == true
-
- if (!isPriorityEnabled) {
- (requireActivity() as MainActivity).apply {
- startActivitySafely(powerManagement.disableBatteryOptimizationsIntent)
- }
- }
+ settingsRow.setOnClickListener {
+ (requireActivity() as MainActivity).apply {
+ startActivitySafely(powerManagement.toBatteryOptimizationSettingsIntent)
}
}
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 fba3d512d98f27b2defeae0c9440e8e38ea3c86e..f212dc67ac9e95a59122f396ec7b0eab93e19205 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
@@ -57,20 +57,51 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <include
- android:id="@+id/settings_switch_row_background_priority"
- layout="@layout/include_settings_switch_row"
- android:layout_width="@dimen/match_constraint"
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/settings_row_background_priority"
+ style="@style/row"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_small"
- app:enabled="@{!settingsViewModel.isBackgroundPriorityEnabled()}"
+ android:focusable="true"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/settings_background_priority_header_details">
+
+ <TextView
+ android:id="@+id/settings_row_background_priority_header_subtitle"
+ style="@style/subtitle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="@string/settings_background_priority_title"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/settings_row_background_priority_header_body"
+ style="@style/body2Medium"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_mega_tiny"
+ android:accessibilityLiveRegion="assertive"
+ android:text="@{FormatterSettingsHelper.formatStatus(settingsViewModel.isBackgroundPriorityEnabled())}"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/settings_row_background_priority_header_subtitle" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <include
+ layout="@layout/include_divider"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/card_divider"
+ android:layout_marginStart="@dimen/guideline_start"
+ android:layout_marginEnd="@dimen/guideline_end"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/settings_background_priority_header_details"
- app:showDivider="@{true}"
- app:status="@{settingsViewModel.isBackgroundPriorityEnabled()}"
- app:statusText="@{FormatterSettingsHelper.formatStatus(settingsViewModel.isBackgroundPriorityEnabled())}"
- app:subtitle="@{@string/settings_background_priority_title}" />
+ app:layout_constraintTop_toBottomOf="@+id/settings_row_background_priority" />
<include
android:id="@+id/settings_tracing_status_connection"
@@ -78,13 +109,12 @@
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
- android:visibility="@{FormatterHelper.formatVisibility(settingsViewModel.isBackgroundPriorityEnabled())}"
app:body="@{@string/settings_background_priority_card_body}"
app:buttonText="@{@string/settings_background_priority_card_button}"
app:headline="@{@string/settings_background_priority_card_headline}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
- app:layout_constraintTop_toBottomOf="@id/settings_switch_row_background_priority" />
+ app:layout_constraintTop_toBottomOf="@id/settings_row_background_priority" />
<include layout="@layout/merge_guidelines_side" />
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 3c7dd2a1c7b217b4b96d02877061c3ad5e8a035e..293608ea2aafda5c771cda99def46a279f5a1eec 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -624,11 +624,11 @@
<!-- XACT: settings(background priority) - illustraction description -->
<string name="settings_background_priority_illustration_description" />
<!-- XTXT: settings(background priority) - explains user what to do on card if background priority is enabled -->
- <string name="settings_background_priority_card_body">"Um die priorisierte Hintergrundaktivität auszuschalten, deaktivieren Sie sie bitte in den Geräte-Einstellungen."</string>
+ <string name="settings_background_priority_card_body">"Sie können die priorisierte Hintergrundaktivität in den Einstellungen Ihres Smartphones ein- beziehungsweise ausschalten."</string>
<!-- XBUT: settings(background priority) - go to operating system settings button on card -->
- <string name="settings_background_priority_card_button">"Geräte-Einstellungen öffnen"</string>
+ <string name="settings_background_priority_card_button">"Smartphone-Einstellungen öffnen"</string>
<!-- XHED : settings(background priority) - headline on card about the current status and what to do -->
- <string name="settings_background_priority_card_headline">"Priorisierte Hintergrundaktivität ausschalten"</string>
+ <string name="settings_background_priority_card_headline">"Priorisierte Hintergrundaktivität ändern"</string>
<!-- ####################################
App Information