Merge branch 'release/1.13.x' into fix/DEV-merge-1.13-into-1.14
# Conflicts: # Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt # Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt # gradle.properties
Showing
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt 2 additions, 0 deletions...awarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/analytics/storage/AnalyticsSettings.kt 6 additions, 0 deletions...rnapp/datadonation/analytics/storage/AnalyticsSettings.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt 10 additions, 4 deletions...va/de/rki/coronawarnapp/release/NewReleaseInfoFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoNavigationEvents.kt 1 addition, 0 deletions...i/coronawarnapp/release/NewReleaseInfoNavigationEvents.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/release/NewReleaseInfoViewModel.kt 9 additions, 3 deletions...a/de/rki/coronawarnapp/release/NewReleaseInfoViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt 2 additions, 2 deletions...oronawarnapp/ui/onboarding/OnboardingAnalyticsFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsViewModel.kt 12 additions, 15 deletions...ronawarnapp/ui/onboarding/OnboardingAnalyticsViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt 9 additions, 2 deletions...warnapp/ui/onboarding/OnboardingDeltaAnalyticsFragment.kt
- Corona-Warn-App/src/test/java/de/rki/coronawarnapp/release/NewReleaseInfoViewModelTest.kt 27 additions, 5 deletions.../rki/coronawarnapp/release/NewReleaseInfoViewModelTest.kt
- Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsViewModelTest.kt 84 additions, 0 deletions...warnapp/ui/onboarding/OnboardingAnalyticsViewModelTest.kt
Loading
Please register or sign in to comment