TB 41972: [android] Disable Mozilla onboarding (395b9d5e) · Commits · The Tor Project / Applications / Tor Browser

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -769,7 +769,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>
		@@ -802,7 +802,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>
		@@ -813,7 +813,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>

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -26,7 +26,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

		@@ -34,7 +34,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
		@@ -43,7 +43,7 @@ features:
		card-type: sync-sign-in
		title: juno_onboarding_sign_in_title_2
		body: juno_onboarding_sign_in_description_2
		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
		@@ -52,7 +52,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
		@@ -85,7 +85,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
		@@ -359,7 +359,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",
		@@ -368,7 +368,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",
		@@ -377,7 +377,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",
		@@ -386,7 +386,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",
		@@ -395,7 +395,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",
		@@ -404,7 +404,7 @@ private val syncPageUiDataWithPrivacyCaption = 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",
		@@ -414,7 +414,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"),
		@@ -426,7 +426,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"),
		@@ -438,7 +438,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"),
		@@ -450,7 +450,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"),
		@@ -460,7 +460,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"),
		@@ -472,7 +472,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/HomeActivity.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -339,10 +339,11 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
		} else {
		StartOnHome.enterHomeScreen.record(NoExtras())
		}

		/*
		if (settings().showHomeOnboardingDialog && components.fenixOnboarding.userHasBeenOnboarded()) {
		navHost.navController.navigate(NavGraphDirections.actionGlobalHomeOnboardingDialog())
		}
		*/
		}

		Performance.processIntentIfPerformanceTest(intent, this)