diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_crashreporter_overview.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_crashreporter_overview.xml
index 66f38d075fb3cc8c03b5080f5f9293bf3cbcad5c..64f0d33f6a3de65bdc0481f9b59451570d794d51 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_crashreporter_overview.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_crashreporter_overview.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
tools:context=".ui.main.MainActivity">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbarErrorReport"
style="@style/Widget.AppCompat.Toolbar"
android:layout_width="match_parent"
@@ -70,5 +70,4 @@
tools:context="SettingsCrashReporterFragment"
tools:listitem="@layout/view_crashreport_list_item" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml
index 8140fa2cbc54b5dadbd4998342ed00092755ae04..c05c8054e842dedc6d42bd6289d596470d246b4e 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml
@@ -32,7 +32,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <Switch
+ <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/fake_metered_connection_toggle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_menu.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_menu.xml
index 807e881a75173a9c0229d1a547d2b588ec679a5c..4e8e908b151cdf6396aa2cb127b3293c532de135 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_menu.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_menu.xml
@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Widget.AppCompat.Toolbar"
android:layout_width="match_parent"
diff --git a/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_fragment.xml b/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_fragment.xml
index a729a715dec1edf4577bd2c4a2331ae868b0b139..a4edac6db8479de1a38df269c66eedf71bdccaed 100644
--- a/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_fragment.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_comment_info_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_comment_info_fragment.xml
index b2d7b3114fcaeacdf31acd056688e643154c1a15..0a0d9d9b17d8448ff87c6a633d02331d121f87fb 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_comment_info_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_comment_info_fragment.xml
@@ -5,13 +5,12 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
- style="@style/CWAToolbar"
+ style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:navigationIcon="@drawable/ic_close" />
+ android:layout_marginStart="8dp" />
<ScrollView
android:layout_width="match_parent"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
index 101c40867eddf5c040ebc1710c1c2a1bb715c77b..5e28a5a9d8b813d544f754488e757ae5d0b95163 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
@@ -9,7 +9,7 @@
android:layout_height="match_parent"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/contact_diary_day_header"
style="@style/CWAToolbar.BackArrow"
android:layout_width="0dp"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
index 72bfa17005cd72bc5645155e10d221a8b56c88c9..9006453c6aa2e54b871fc94490d1b04cc31b4a24 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
@@ -9,7 +9,7 @@
android:layout_height="match_parent"
android:contentDescription="@string/contact_diary_edit_locations_title">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="0dp"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
index e58bf18b26d95cd7af8ceffafc57a420435a63f2..bb23fa72b8a706320cefde91fb426e0c86d08591 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
@@ -9,7 +9,7 @@
android:layout_height="match_parent"
android:contentDescription="@string/contact_diary_edit_persons_title">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_homescreen_card_include.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_homescreen_card_include.xml
index 390d2b13cf7b3690a5cbb5178106cc0717f36be4..b7f33780b8a4d465a9183d1661ea7e357ec6d3f0 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_homescreen_card_include.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_homescreen_card_include.xml
@@ -34,7 +34,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contact_diary_card_homescreen_title" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_diary_card_homescreen_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml
index ea59fb9e0b29f95ecfe8689bef0ecfc0824d7edb..4a5fcd8614870ddc5ae57476f2dbfe2a0876c639 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml
@@ -27,7 +27,7 @@
android:visibility="gone"
app:constraint_referenced_ids="contact_diary_location_list_no_items_image,contact_diary_location_list_no_items_title,contact_diary_location_list_no_items_subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_diary_location_list_no_items_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
index e726b8d0cc6036164b243272ae9d2242f4d81892..e13817189b34f388922075b048ec033ac77bf580 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
@@ -12,7 +12,7 @@
android:contentDescription="@string/contact_diary_title"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml
index 503bc98d761c9f55006ca2d5e430f0e8d5e602c9..b66cdd2c0d60badf6f5f74d4c2de9fdd381d7979 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml
@@ -9,7 +9,7 @@
android:background="@color/colorBackground"
android:orientation="vertical">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml
index 37cf73437b095a12485cb8d39825bbbf51492352..42d76704e7c2750b5f23e767f65caa73dfc0ffdd 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml
@@ -27,7 +27,7 @@
android:visibility="gone"
app:constraint_referenced_ids="contact_diary_person_list_no_items_image,contact_diary_person_list_no_items_title,contact_diary_person_list_no_items_subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_diary_person_list_no_items_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
index a34da0c9424fbd812f17a364ab83371d645a6a1e..7723129e1f0043eb2067f5a1ef7fc31ca2ea2550 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:paddingBottom="@dimen/spacing_medium">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/onboarding_illustration"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_delta_ppa.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_delta_ppa.xml
index 464d8c50f8ee5babb217b25ac47cb0f9f474a57e..945b64ea86c12facceeacbcdec192b5e6a346009 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_delta_ppa.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_delta_ppa.xml
@@ -280,7 +280,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_consent"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -303,7 +303,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_consent" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_identity"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -326,7 +326,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_identity" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_sixteen"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_ppa.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_ppa.xml
index bd4f247b1a02d8edb40a9dec2995681519711807..fddc1bafe696935ba1f7a27e09be7a3f6b214e2e 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_ppa.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_ppa.xml
@@ -286,7 +286,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_consent"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -309,7 +309,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_consent" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_identity"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -332,7 +332,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_identity" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_sixteen"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml b/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml
index 4acd20f2b086f3d68190b79faa099565a4b4f012..02379b9dd847711461895979192a3a02f555ee2b 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml
@@ -597,7 +597,7 @@
<TableRow
android:layout_marginTop="@dimen/spacing_small">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/other_info_point_1"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml
index eec2f250912951aac825936469576328b904fe19..cfba7139fe405ba1334bd3e855b81dc997fa4e81 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml
@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/onboarding_illustration"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@id/bullet_point_consent"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -191,7 +191,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_consent" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@id/bullet_point_identity"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -214,7 +214,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@id/legal_point_identity" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@id/bullet_point_sixteen"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
index 906b8f3dd1a67de9385be0f5034837247e0beaab..fe996c6bc980a66d4f6ae2eda6151dc322df9d63 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
@@ -23,7 +23,7 @@
android:contentDescription="@string/settings_tracing_title"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
@@ -108,7 +108,7 @@
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/switch_row">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/flag_eu"
android:layout_width="26dp"
android:layout_height="26dp"
@@ -127,7 +127,7 @@
app:layout_constraintStart_toEndOf="@id/flag_eu"
app:layout_constraintTop_toTopOf="@id/flag_eu" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/flag_ch"
android:layout_width="0dp"
android:layout_height="22dp"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml b/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
index 082aa18e15213023e746986a0d2735bad6b20ecd..fa6a203d8cad9043160c76755aa14d9a7e5220a8 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
@@ -108,7 +108,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/interoperability_illustration"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -346,7 +346,7 @@
android:layout_marginTop="25dp"
android:layout_marginEnd="@dimen/guideline_end">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/statistics_explanation_trend_increasing_arrow"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -371,7 +371,7 @@
app:layout_constraintStart_toEndOf="@+id/statistics_explanation_trend_increasing_arrow"
app:layout_constraintTop_toTopOf="@+id/statistics_explanation_trend_increasing_arrow" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/statistics_explanation_trend_decreasing_arrow"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -397,7 +397,7 @@
app:layout_constraintStart_toEndOf="@+id/statistics_explanation_trend_decreasing_arrow"
app:layout_constraintTop_toTopOf="@+id/statistics_explanation_trend_decreasing_arrow" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/statistics_explanation_trend_stable_arrow"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml
index 5b89dec0d5222de7328ab7f2a25781a5dc5c3c18..5d0f28070e10d837bf41d284d8ab620c481c7100 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml
@@ -8,7 +8,7 @@
android:contentDescription="@string/submission_deletion_warning_title"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/deletion_warning_illustration"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
index 25844017a9edf419fd46c3b30e697558c7e78cab..b4ed1f9ee9db30e0c4a1652430e2b8ffa5e17dad 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
@@ -11,7 +11,7 @@
android:fillViewport="true"
tools:context=".ui.submission.fragment.SubmissionDoneFragment">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml
index 07ef45ea131f55b072dff90511434bd3a21dc6a9..c73df8d501d1b27d3ef6abd18af52b5f5c05dacc 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml
@@ -18,7 +18,7 @@
android:fillViewport="true"
tools:context=".ui.submission.warnothers.SubmissionResultPositiveOtherWarningNoConsentFragment">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_keys_shared.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_keys_shared.xml
index 7f26366943bd40fbdf4faf1306c7d6efcd6be2bc..ece322a33f4623cc8971e60e9ff11edc8f5095b5 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_keys_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_keys_shared.xml
@@ -9,7 +9,7 @@
android:accessibilityLiveRegion="assertive"
android:contentDescription="@string/submission_test_result_headline">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_test_home_test_cards_layout.xml b/Corona-Warn-App/src/main/res/layout/fragment_test_home_test_cards_layout.xml
index 03465872a364efac9d328977fc27308d20df4190..696c625e8541069f76f81dd850bd06836fa77cb8 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_test_home_test_cards_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_test_home_test_cards_layout.xml
@@ -18,11 +18,11 @@
android:orientation="vertical"
tools:context=".ui.main.MainActivity">
- <Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
+ style="@style/CWAToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/CWAToolbar"
app:popupTheme="@style/CWAToolbar.Menu">
<ImageView
android:id="@+id/main_header_logo"
@@ -34,7 +34,7 @@
android:src="@drawable/ic_main_header"
bind:cwaContentDescription="@{@string/accessibility_logo}"
tools:ignore="ContentDescription" />
- </Toolbar>
+ </com.google.android.material.appbar.MaterialToolbar>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
@@ -42,16 +42,16 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
- android:theme="@style/CWAToolbar"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:theme="@style/CWAToolbar">
- <Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
+ android:id="@+id/main_tracing"
+ style="@style/CWAToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:elevation="8dp"
- style="@style/CWAToolbar"
- android:id="@+id/main_tracing"
android:clickable="true"
+ android:elevation="8dp"
android:focusable="true"
android:foreground="?selectableItemBackground"
app:layout_scrollFlags="scroll|snap|enterAlways">
@@ -78,7 +78,7 @@
app:animation="@{tracingHeader.getTracingAnimation(context)}"
app:animation_tint="@{tracingHeader.getTracingTint(context)}" />
- </Toolbar>
+ </com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml b/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml
index ff2b328fa8a3cf07118805662e7f490c649bd83f..bf6780e5a569092f3fb8c84b75a813b0cefe7728 100644
--- a/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml
@@ -31,7 +31,7 @@
app:layout_constraintTop_toBottomOf="@id/create_trace_location_card_headline"
tools:text="@string/create_trace_location_card_subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/create_trace_location_card_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml
index 7eee9560c166dc4b7e507df6d0fd25f7b1a25c92..d1969a13b506b7a8312375d84a17fe9e7bc9e1ec 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml
@@ -12,7 +12,7 @@
android:id="@+id/incidence_container"
tools:showIn="@layout/home_statistics_cards_basecard_layout">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/background_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml
index 1d54ca078e19c2008ac9b13851aaa11bb7d8fe20..31410db6eb5357070b2345ee9459f302430f0bc6 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml
@@ -12,7 +12,7 @@
android:id="@+id/infections_container"
tools:showIn="@layout/home_statistics_cards_basecard_layout">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/background_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml
index 1d486842a6fee8dbac82c1637f95608e5b6e3114..0b64677699659882b8cbf5f59ff4dd1ff523b5c0 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml
@@ -12,7 +12,7 @@
android:id="@+id/keysubmissions_container"
tools:showIn="@layout/home_statistics_cards_basecard_layout">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/background_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml
index 57f7e82475116fe8e63ca7d7a8eab9beb0c464b0..07640dab4df1f979a97a523b9aa0c064252de88f 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml
@@ -12,7 +12,7 @@
android:id="@+id/seven_day_r_value_container"
tools:showIn="@layout/home_statistics_cards_basecard_layout">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/background_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_error.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_error.xml
index c49ecb6fb79e3c97427dfdd60238de2e7cf77e75..ec8c361b3e950098e33db28e2a380a78321337f3 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_error.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_error.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_invalid.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_invalid.xml
index 6c03a73581718fbcb1cc1ae1141b536c37c3d49f..9b5813b1737ad52d076897abaa584f171a664c95 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_invalid.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_invalid.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_negative.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_negative.xml
index 6b23023977d63eda004770d1cf3ba16fa93d96d8..ccdbe8acef0a1dcba6f74f3ff02bdae8c2362ccf 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_negative.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_negative.xml
@@ -91,7 +91,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_pending.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_pending.xml
index da6cb6b82918c50ac40cc55550cf4f550ff4f7f9..6c0fcf602fca67c1c2097e8c3c6eda6456f20615 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_pending.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_pending.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_not_shared.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_not_shared.xml
index 65812e9d4cd43430cba8cc75fd50b5139125c4f6..f69b2b2634964a7451b048a8aa7766960d869a27 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_not_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_not_shared.xml
@@ -84,7 +84,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -143,7 +143,7 @@
app:layout_constraintStart_toEndOf="@+id/contact_icon"
app:layout_constraintTop_toTopOf="@+id/contact_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contagious_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -171,7 +171,7 @@
app:layout_constraintStart_toEndOf="@+id/contagious_icon"
app:layout_constraintTop_toTopOf="@+id/contagious_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/share_icon"
style="@style/icon"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_shared.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_shared.xml
index bc0dd85a63b74a3bc6535adf01720ef3b162ce55..80b89358a8100e99634fc7e788238a6f5e7f4634 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_shared.xml
@@ -84,7 +84,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -143,7 +143,7 @@
app:layout_constraintStart_toEndOf="@+id/contact_icon"
app:layout_constraintTop_toTopOf="@+id/contact_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contagious_icon"
style="@style/icon"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_ready.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_ready.xml
index b4d9ecbbc923c8b46b325a88aee703e881bc1484..28ff61c8a38d395b9e7047b8fcaec70a1c062564 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_ready.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_ready.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_error.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_error.xml
index eec3d36c7890f062905f402dea4b655fb337c9cd..007dcea8d5c2d82ad55c85752c89b4aa89f09264 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_error.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_error.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_invalid.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_invalid.xml
index 5ee0fdbae1dff0e9e2f1e858e0c6c246cc3d1c0e..8527df7657a5494994f24bfbf5b5b6ee3ac83b47 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_invalid.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_invalid.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_negative.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_negative.xml
index c08d9fef1b9255c8f777133500ac06f80c87b5cc..dd1da1efc4dcb11211a9e6db6a406cdc08a8647e 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_negative.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_negative.xml
@@ -91,7 +91,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_outdated.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_outdated.xml
index 8ba510968c65f48c5a71a07cf4fd0832fe514ff7..906c9dc733b14cb0a09dacd7c455dd1351d38057 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_outdated.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_outdated.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_pending.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_pending.xml
index 5c9eb6e5541b817f82f7dfaa98704166d77bf1bc..3522c0bd30e1217601bb972078c2a6c2759f7948 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_pending.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_pending.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_not_shared.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_not_shared.xml
index 33bf2d3e74a207b9d98019a3d909ac701ceb5355..380fce89b3016e3ca2d4b27d521cf9f0410672e7 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_not_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_not_shared.xml
@@ -84,7 +84,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/prc_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
app:layout_constraintStart_toEndOf="@+id/prc_icon"
app:layout_constraintTop_toTopOf="@+id/prc_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -172,7 +172,7 @@
app:layout_constraintStart_toEndOf="@+id/contact_icon"
app:layout_constraintTop_toTopOf="@+id/contact_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contagious_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -200,7 +200,7 @@
app:layout_constraintStart_toEndOf="@+id/contagious_icon"
app:layout_constraintTop_toTopOf="@+id/contagious_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/share_icon"
style="@style/icon"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_shared.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_shared.xml
index 9ecf98e1234564db8b62a7b6c85f92dd1929c866..0b0c503b0d9a73884815c30a999b362365de2246 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_shared.xml
@@ -84,7 +84,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/prc_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
app:layout_constraintStart_toEndOf="@+id/prc_icon"
app:layout_constraintTop_toTopOf="@+id/prc_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -172,7 +172,7 @@
app:layout_constraintStart_toEndOf="@+id/contact_icon"
app:layout_constraintTop_toTopOf="@+id/contact_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contagious_icon"
style="@style/icon"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_ready.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_ready.xml
index 26747ccb991403571436853831e9c862d6b917f0..1211238ff9b1ceb053dcf2810787cd82284a73b8 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_ready.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_ready.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_status_card_unregistered.xml b/Corona-Warn-App/src/main/res/layout/home_submission_status_card_unregistered.xml
index 4004baa2d329e216b4ca2f88560529a381f8bfed..edf3afd3b6afc1dfe6a61d5d0d2ff46b631cee9d 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_status_card_unregistered.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_status_card_unregistered.xml
@@ -37,7 +37,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml b/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml
index 046b5250db1ee8551e37d106a3fc851bc58875a7..f88e80dbe8e9e73427924d27f140b34424bea65b 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml
@@ -27,7 +27,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
style="@style/icon"
android:layout_width="@dimen/icon_size_risk_details_behavior"
android:layout_height="@dimen/icon_size_risk_details_behavior"
diff --git a/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml b/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml
index 9761fcdcf4c4c0ac5dc8596a25ea536ce56538fc..27abf1496b5df95f0927ab61caa7c7fefd6adb42 100644
--- a/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml
@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="0dp"
diff --git a/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml b/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml
index fe1c3c7ef61715c5c5e095444fe87ac18213bc71..ede7afa130e49722de36bf32e763906aa3dadb7c 100644
--- a/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml
@@ -10,7 +10,7 @@
android:background="@drawable/contact_diary_onboarding_background"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.BackArrow"
android:layout_width="0dp"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_list_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_list_fragment.xml
index 7cc778f51698899505c2beef24786640fd99ec0a..255ed0fa8049672d69931d78a26e98a4cd1080b8 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_list_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_list_fragment.xml
@@ -42,7 +42,7 @@
android:layout_height="wrap_content"
app:constraint_referenced_ids="qr_codes__list_no_items_image,qr_codes_list_no_items_title,qr_codes_list_no_items_subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/qr_codes__list_no_items_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
index b5ab40269e5bcc93d7b540ce596642d053fd03b1..527c1a7f5325a8ffc3999058859d8d9f812d3fd0 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
@@ -28,7 +28,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="0dp" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/details_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
index 31da8067055d0218e12fe0675f01f10b53026c44..874f5f839c50f2d36a072b84c6bc7588fdfe1719 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
@@ -27,7 +27,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/risk_card_header_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
index 79688669a658d2ce286d953b6c04897b3dc5cc3c..0fe181f52e7da0a49ee22938f87a4ab587fb937a 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
@@ -29,7 +29,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="0dp" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/details_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
index 0c569562d3d1fe3ad86431eb15aa91f29f59327d..8d6e9e7260307b80843e9bd8617a1ad477695e47 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
@@ -31,7 +31,7 @@
tools:text="@string/risk_card_low_risk_headline"
tools:textColor="@color/colorStableLight" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/details_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
index 10154cbf3cecfb6b580dac8e08dc49c4b288f87d..25892b2a8efc99a6f95587f4883b76eefb6a6a95 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
@@ -29,7 +29,7 @@
app:layout_goneMarginEnd="0dp"
tools:text="Daten werden herunter geladen" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/details_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_details_access_survey_card.xml b/Corona-Warn-App/src/main/res/layout/tracing_details_access_survey_card.xml
index 69635c8f19b5127277f2e49069fd13d12ef6c1e8..bdfb816c9842767120df9e5559552e14692b0a09 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_details_access_survey_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_details_access_survey_card.xml
@@ -42,7 +42,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tracing_details_survey_card_title" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/tracing_details_survey_card_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_details_fragment_layout.xml b/Corona-Warn-App/src/main/res/layout/tracing_details_fragment_layout.xml
index d6ff95745ba0aab96ca1166ee1aa12d0bcc15cf9..a239f18d87d0048a566e21d5269b2c1addec331f 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_details_fragment_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_details_fragment_layout.xml
@@ -16,7 +16,7 @@
android:layout_height="match_parent"
android:contentDescription="@string/risk_details_accessibility_title">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="match_parent"