Merge branch 'release/1.11.x' into feature/2950-home-screenshots
# Conflicts: # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt # Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt
No related branches found
No related tags found
Showing
- Corona-Warn-App/build.gradle 44 additions, 41 deletionsCorona-Warn-App/build.gradle
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/reporting/ErrorReportReceiver.kt 1 addition, 1 deletion.../coronawarnapp/exception/reporting/ErrorReportReceiver.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/TracingSettingsState.kt 28 additions, 27 deletions...coronawarnapp/tracing/ui/settings/TracingSettingsState.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt 0 additions, 1 deletion...rc/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/notifications/NotificationSettingsState.kt 2 additions, 1 deletion...pp/ui/settings/notifications/NotificationSettingsState.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsBackgroundState.kt 2 additions, 1 deletion...oronawarnapp/ui/settings/start/SettingsBackgroundState.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsNotificationState.kt 2 additions, 1 deletion...onawarnapp/ui/settings/start/SettingsNotificationState.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/start/SettingsTracingState.kt 5 additions, 4 deletions...i/coronawarnapp/ui/settings/start/SettingsTracingState.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/TanInput.kt 6 additions, 7 deletions...n/java/de/rki/coronawarnapp/ui/submission/tan/TanInput.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/LocationTracingStatusCardBodyTextView.kt 6 additions, 18 deletions...awarnapp/ui/view/LocationTracingStatusCardBodyTextView.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/TestResultSectionView.kt 2 additions, 1 deletion...ava/de/rki/coronawarnapp/ui/view/TestResultSectionView.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt 2 additions, 2 deletions...main/java/de/rki/coronawarnapp/util/ConnectivityHelper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ContextExtensions.kt 9 additions, 0 deletions.../main/java/de/rki/coronawarnapp/util/ContextExtensions.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt 10 additions, 1 deletion...ain/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterHelper.kt 1 addition, 1 deletion...va/de/rki/coronawarnapp/util/formatter/FormatterHelper.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt 4 additions, 3 deletions...coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
- Corona-Warn-App/src/main/res/layout/fragment_onboarding_notifications.xml 1 addition, 1 deletion...src/main/res/layout/fragment_onboarding_notifications.xml
- Corona-Warn-App/src/main/res/layout/fragment_onboarding_test.xml 1 addition, 1 deletion...Warn-App/src/main/res/layout/fragment_onboarding_test.xml
- Corona-Warn-App/src/main/res/layout/fragment_onboarding_tracing.xml 1 addition, 1 deletion...n-App/src/main/res/layout/fragment_onboarding_tracing.xml
- Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_no_consent.xml 4 additions, 6 deletions...t/fragment_submission_test_result_positive_no_consent.xml
Loading
Please register or sign in to comment