From 9c5ba4317b409bacf02a4bf535ead59516767d6b Mon Sep 17 00:00:00 2001
From: Fabian-K <fabian.kajzar@sap.com>
Date: Thu, 30 Jul 2020 11:45:27 +0200
Subject: [PATCH] Prevent overlapping text with tracing status icon
 [EXPOSUREAPP-1950, EXPOSUREAPP-1949] (#942)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add missing content description to deviceForTesters variant

Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
 .../src/deviceForTesters/res/layout/fragment_main.xml          | 3 +++
 Corona-Warn-App/src/main/res/layout/fragment_main.xml          | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml
index c9ea631a2..6bc3b0d30 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_main.xml
@@ -96,9 +96,12 @@
                     style="@style/bodyButton"
                     android:layout_width="@dimen/match_constraint"
                     android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/spacing_small"
                     android:focusable="false"
+                    android:contentDescription="@{FormatterSettingsHelper.formatTracingContentDescription(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled(), settingsViewModel.isLocationEnabled())}"
                     android:text="@{FormatterSettingsHelper.formatTracingDescription(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled(), settingsViewModel.isLocationEnabled())}"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/main_tracing_icon"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main.xml b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
index 35dc3600f..25ccaf2fe 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
@@ -101,10 +101,12 @@
                     style="@style/bodyButton"
                     android:layout_width="@dimen/match_constraint"
                     android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/spacing_small"
                     android:focusable="false"
                     android:contentDescription="@{FormatterSettingsHelper.formatTracingContentDescription(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled(), settingsViewModel.isLocationEnabled())}"
                     android:text="@{FormatterSettingsHelper.formatTracingDescription(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled(), settingsViewModel.isLocationEnabled())}"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/main_tracing_icon"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
-- 
GitLab