Commit 052ff95a authored by Dan Ballard's avatar Dan Ballard Committed by Pier Angelo Vendrame
Browse files

TB 41972: [android] Disable Mozilla onboarding

parent 5b55e575

mobile/android/fenix/app/lint-baseline.xml

+3 −3
Original line number Diff line number Diff line
@@ -1855,7 +1855,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>
@@ -1899,7 +1899,7 @@ 
        errorLine1="    android:width=&quot;312dp&quot;"

        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>
@@ -1910,7 +1910,7 @@ 
        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; xmlns:aapt=&quot;http://schemas.android.com/aapt&quot; android:width=&quot;235dp&quot; android:height=&quot;298dp&quot; android:viewportWidth=&quot;235&quot; android:viewportHeight=&quot;298&quot;>"

        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>

mobile/android/fenix/app/onboarding.fml.yaml

+11 −11
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ features: 
              title: juno_onboarding_default_browser_title_nimbus_2

              ordering: 10

              body: juno_onboarding_default_browser_description_nimbus_3

              image-res: ic_onboarding_welcome

              image-res: mozac_lib_crash_notification

              primary-button-label: juno_onboarding_default_browser_positive_button

              secondary-button-label: juno_onboarding_default_browser_negative_button
@@ -50,7 +50,7 @@ features: 
              card-type: add-search-widget

              title: juno_onboarding_add_search_widget_title

              body: juno_onboarding_add_search_widget_description

              image-res: ic_onboarding_search_widget

              image-res: mozac_lib_crash_notification

              ordering: 15

              primary-button-label: juno_onboarding_add_search_widget_positive_button

              secondary-button-label: juno_onboarding_add_search_widget_negative_button
@@ -59,7 +59,7 @@ features: 
              card-type: sync-sign-in

              title: juno_onboarding_sign_in_title_2

              body: juno_onboarding_sign_in_description_3

              image-res: ic_onboarding_sync

              image-res: mozac_lib_crash_notification

              ordering: 20

              primary-button-label: juno_onboarding_sign_in_positive_button

              secondary-button-label: juno_onboarding_sign_in_negative_button
@@ -68,7 +68,7 @@ features: 
              card-type: notification-permission

              title: juno_onboarding_enable_notifications_title_nimbus_2

              body: juno_onboarding_enable_notifications_description_nimbus_2

              image-res: ic_notification_permission

              image-res: mozac_lib_crash_notification

              ordering: 30

              primary-button-label: juno_onboarding_enable_notifications_positive_button

              secondary-button-label: juno_onboarding_enable_notifications_negative_button
@@ -129,7 +129,7 @@ features: 
              enabled: false

              title: onboarding_welcome_to_firefox

              ordering: 0

              image-res: ic_firefox

              image-res: mozac_lib_crash_notification

              primary-button-label: onboarding_term_of_service_agree_and_continue_button_label_2

              extra-data:

                term-of-service-data:
@@ -146,7 +146,7 @@ features: 
              title: juno_onboarding_default_browser_title_nimbus_2

              ordering: 5

              body: juno_onboarding_default_browser_description_nimbus_3

              image-res: ic_onboarding_welcome

              image-res: mozac_lib_crash_notification

              primary-button-label: juno_onboarding_default_browser_positive_button

              secondary-button-label: juno_onboarding_default_browser_negative_button
@@ -155,7 +155,7 @@ features: 
              card-type: add-search-widget

              title: juno_onboarding_add_search_widget_title

              body: juno_onboarding_add_search_widget_description

              image-res: ic_onboarding_search_widget

              image-res: mozac_lib_crash_notification

              ordering: 10

              primary-button-label: juno_onboarding_add_search_widget_positive_button

              secondary-button-label: juno_onboarding_add_search_widget_negative_button
@@ -165,7 +165,7 @@ features: 
              card-type: sync-sign-in

              title: juno_onboarding_sign_in_title_2

              body: juno_onboarding_sign_in_description_3

              image-res: ic_onboarding_sync

              image-res: mozac_lib_crash_notification

              ordering: 15

              primary-button-label: juno_onboarding_sign_in_positive_button

              secondary-button-label: juno_onboarding_sign_in_negative_button
@@ -175,7 +175,7 @@ features: 
              card-type: notification-permission

              title: juno_onboarding_enable_notifications_title_nimbus_2

              body: juno_onboarding_enable_notifications_description_nimbus_2

              image-res: ic_notification_permission

              image-res: mozac_lib_crash_notification

              ordering: 20

              primary-button-label: juno_onboarding_enable_notifications_positive_button

              secondary-button-label: juno_onboarding_enable_notifications_negative_button
@@ -222,7 +222,7 @@ features: 
              enabled: false

              title: onboarding_marketing_title

              body: onboarding_marketing_body

              image-res: ic_onboarding_welcome

              image-res: mozac_lib_crash_notification

              ordering: 40

              primary-button-label: onboarding_marketing_positive_button

              extra-data:
@@ -259,7 +259,7 @@ objects: 
        type: Image

        description: The resource id of the image to be displayed.

        # This should never be defaulted.

        default: ic_onboarding_welcome

        default: mozac_lib_crash_notification

      ordering:

        type: Int

        description: Used to sequence the cards.

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt

+12 −12
Original line number Diff line number Diff line
@@ -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"),