Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Exposure Logging: text missing when, bluetooth disabled (EXPOSUREAPP-6190) #2779

Merged
merged 8 commits into from
Apr 9, 2021
Merged

Exposure Logging: text missing when, bluetooth disabled (EXPOSUREAPP-6190) #2779

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f587c89
Period logged description no longer disappearing when bluetooth disab…
SamuraiKek Apr 8, 2021
16104d9
Merge branch 'release/2.0.x' into fix/6190-text-missing-bl-off-expo-l…
SamuraiKek Apr 8, 2021
9e5e0dc
Merge branch 'release/2.0.x' into fix/6190-text-missing-bl-off-expo-l…
harambasicluka Apr 8, 2021
fa94ca4
Merge branch 'release/2.0.x' into fix/6190-text-missing-bl-off-expo-l…
harambasicluka Apr 9, 2021
35ba81e
Merge branch 'release/2.0.x' into fix/6190-text-missing-bl-off-expo-l…
harambasicluka Apr 9, 2021
7643753
Merge branch 'release/2.0.x' into fix/6190-text-missing-bl-off-expo-l…
chris-cwa Apr 9, 2021
9b4007b
Added a bit more margin to the Period Logged title.
SamuraiKek Apr 9, 2021
3c51001
Merge branch 'release/2.0.x' into fix/6190-text-missing-bl-off-expo-l…
SamuraiKek Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
android:id="@+id/settings_tracing_status_bluetooth"
gone="@{!settingsTracingState.isBluetoothCardVisible()}"
layout="@layout/include_tracing_status_card"
android:layout_marginBottom="@dimen/spacing_small"
SamuraiKek marked this conversation as resolved.
Show resolved Hide resolved
android:layout_width="0dp"
android:layout_height="wrap_content"
app:body="@{@string/settings_tracing_status_bluetooth_body}"
Expand Down Expand Up @@ -213,7 +214,6 @@
<TextView
android:id="@id/risk_details_period_logged_body_notice"
style="@style/subtitle"
gone="@{!settingsTracingState.isTracingStatusTextVisible()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
Expand All @@ -226,7 +226,6 @@
<TextView
android:id="@+id/risk_details_period_logged_days"
style="@style/subtitle"
gone="@{!settingsTracingState.isTracingStatusTextVisible()}"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
Expand Down