commit c92639c1c2870b857efee15502ec2e6c9e5571ed
parent cc616b89abefe70d94150f64036441e30225f53a
Author: Dan Ballard <dan@mindstab.net>
Date: Wed, 9 Aug 2023 13:32:54 -0700
TB 41972: [android] Disable Mozilla onboarding
Diffstat:
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/mobile/android/fenix/app/lint-baseline.xml b/mobile/android/fenix/app/lint-baseline.xml
@@ -227,7 +227,7 @@
errorLine1=" android:width="973dp""
errorLine2=" ~~~~~">
<location
- file="src/main/res/drawable/ic_notification_permission.xml"
+ file="src/main/res/drawable/mozac_lib_crash_notification.xml"
line="7"
column="20"/>
</issue>
@@ -282,7 +282,7 @@
errorLine1=" android:width="312dp""
errorLine2=" ~~~~~">
<location
- file="src/main/res/drawable/ic_onboarding_search_widget.xml"
+ file="src/main/res/drawable/mozac_lib_crash_notification.xml"
line="7"
column="20"/>
</issue>
@@ -293,7 +293,7 @@
errorLine1="<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" android:width="235dp" android:height="298dp" android:viewportWidth="235" android:viewportHeight="298">"
errorLine2=" ~~~~~">
<location
- file="src/main/res/drawable/ic_onboarding_sync.xml"
+ file="src/main/res/drawable/mozac_lib_crash_notification.xml"
line="5"
column="128"/>
</issue>
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt
@@ -580,7 +580,7 @@ val privacyCaption: Caption = mockk(relaxed = true)
private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData(
type = OnboardingPageUiData.Type.DEFAULT_BROWSER,
- imageRes = R.drawable.ic_onboarding_welcome,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = "default browser title",
description = "default browser body",
primaryButtonLabel = "default browser primary button text",
@@ -589,7 +589,7 @@ private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData(
)
private val addSearchWidgetPageUiData = OnboardingPageUiData(
type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
- imageRes = R.drawable.ic_onboarding_search_widget,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = "add search widget title",
description = "add search widget body",
primaryButtonLabel = "add search widget primary button text",
@@ -598,7 +598,7 @@ private val addSearchWidgetPageUiData = OnboardingPageUiData(
)
private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData(
type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
- imageRes = R.drawable.ic_onboarding_search_widget,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = "add search widget title",
description = "add search widget body",
primaryButtonLabel = "add search widget primary button text",
@@ -607,7 +607,7 @@ private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData(
)
private val syncPageUiData = OnboardingPageUiData(
type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
- imageRes = R.drawable.ic_onboarding_sync,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = "sync title",
description = "sync body",
primaryButtonLabel = "sync primary button text",
@@ -616,7 +616,7 @@ private val syncPageUiData = OnboardingPageUiData(
)
private val syncPageUiDataWithPrivacyCaption = OnboardingPageUiData(
type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
- imageRes = R.drawable.ic_onboarding_sync,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = "sync title",
description = "sync body",
primaryButtonLabel = "sync primary button text",
@@ -641,7 +641,7 @@ private val toolbarPageUiData = OnboardingPageUiData(
)
private val notificationPageUiData = OnboardingPageUiData(
type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,
- imageRes = R.drawable.ic_notification_permission,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = "notification title",
description = "notification body",
primaryButtonLabel = "notification primary button text",
@@ -651,7 +651,7 @@ private val notificationPageUiData = OnboardingPageUiData(
private val defaultBrowserCardData = OnboardingCardData(
cardType = OnboardingCardType.DEFAULT_BROWSER,
- imageRes = R.drawable.ic_onboarding_welcome,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = StringHolder(null, "default browser title"),
body = StringHolder(null, "default browser body"),
primaryButtonLabel = StringHolder(null, "default browser primary button text"),
@@ -663,7 +663,7 @@ private val defaultBrowserCardData = OnboardingCardData(
private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData(
cardType = OnboardingCardType.DEFAULT_BROWSER,
- imageRes = R.drawable.ic_onboarding_welcome,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = StringHolder(null, "default browser title"),
body = StringHolder(null, "default browser body"),
primaryButtonLabel = StringHolder(null, "default browser primary button text"),
@@ -675,7 +675,7 @@ private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData(
private val addSearchWidgetCardDataNoConditions = OnboardingCardData(
cardType = OnboardingCardType.ADD_SEARCH_WIDGET,
- imageRes = R.drawable.ic_onboarding_search_widget,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = StringHolder(null, "add search widget title"),
body = StringHolder(null, "add search widget body"),
primaryButtonLabel = StringHolder(null, "add search widget primary button text"),
@@ -687,7 +687,7 @@ private val addSearchWidgetCardDataNoConditions = OnboardingCardData(
private val addSearchWidgetCardData = OnboardingCardData(
cardType = OnboardingCardType.ADD_SEARCH_WIDGET,
- imageRes = R.drawable.ic_onboarding_search_widget,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = StringHolder(null, "add search widget title"),
body = StringHolder(null, "add search widget body"),
primaryButtonLabel = StringHolder(null, "add search widget primary button text"),
@@ -697,7 +697,7 @@ private val addSearchWidgetCardData = OnboardingCardData(
private val syncCardData = OnboardingCardData(
cardType = OnboardingCardType.SYNC_SIGN_IN,
- imageRes = R.drawable.ic_onboarding_sync,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = StringHolder(null, "sync title"),
body = StringHolder(null, "sync body"),
primaryButtonLabel = StringHolder(null, "sync primary button text"),
@@ -709,7 +709,7 @@ private val syncCardData = OnboardingCardData(
private val notificationCardData = OnboardingCardData(
cardType = OnboardingCardType.NOTIFICATION_PERMISSION,
- imageRes = R.drawable.ic_notification_permission,
+ imageRes = R.drawable.mozac_lib_crash_notification,
title = StringHolder(null, "notification title"),
body = StringHolder(null, "notification body"),
primaryButtonLabel = StringHolder(null, "notification primary button text"),