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

TB 41972: [android] Disable Mozilla onboarding

parent e3e4f057

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

+3 −3
Changes for mobile/android/fenix/app/lint-baseline.xml: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -271,7 +271,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>
@@ -326,7 +326,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>
@@ -337,7 +337,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/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt

+10 −10
Changes for mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt: 10 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ class OnboardingMapperTest { 


private val defaultBrowserPageUiData = 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",
@@ -437,7 +437,7 @@ private val defaultBrowserPageUiData = 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",
@@ -445,7 +445,7 @@ private val addSearchWidgetPageUiData = 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",
@@ -468,7 +468,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",
@@ -477,7 +477,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"),
@@ -489,7 +489,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"),
@@ -501,7 +501,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"),
@@ -513,7 +513,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"),
@@ -523,7 +523,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"),
@@ -535,7 +535,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"),

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt

+1 −1
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2295,7 +2295,7 @@ class Settings( 
     */

    var shouldShowMarketingOnboarding by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_should_show_marketing_onboarding),

        default = true,

        default = false,

    )



    var shouldUseMinimalBottomToolbarWhenEnteringText by booleanPreference(