[android] Delete unused media (6724ea92) · Commits · The Tor Project / Applications / Tor Browser

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

+13 −13

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ features:
		title: onboarding_welcome_to_firefox
		body: onboarding_terms_of_service_sub_header_2
		ordering: 1
		image-res: ic_firefox
		image-res: ic_addons_extensions
		primary-button-label: onboarding_term_of_service_agree_and_continue_button_label_2
		extra-data:
		term-of-service-data:
		@@ -46,7 +46,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: ic_addons_extensions
		primary-button-label: juno_onboarding_default_browser_positive_button
		secondary-button-label: juno_onboarding_default_browser_negative_button

		@@ -54,7 +54,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: ic_addons_extensions
		ordering: 15
		primary-button-label: juno_onboarding_add_search_widget_positive_button
		secondary-button-label: juno_onboarding_add_search_widget_negative_button
		@@ -63,7 +63,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: ic_addons_extensions
		ordering: 20
		primary-button-label: juno_onboarding_sign_in_positive_button
		secondary-button-label: juno_onboarding_sign_in_negative_button
		@@ -72,7 +72,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: ic_addons_extensions
		ordering: 30
		primary-button-label: juno_onboarding_enable_notifications_positive_button
		secondary-button-label: juno_onboarding_enable_notifications_negative_button
		@@ -117,7 +117,7 @@ features:
		title: onboarding_marketing_title
		body: onboarding_marketing_body
		ordering: 40
		image-res: ic_onboarding_welcome
		image-res: ic_addons_extensions
		primary-button-label: onboarding_marketing_positive_button
		extra-data:
		marketing-data:
		@@ -133,7 +133,7 @@ features:
		enabled: false
		title: onboarding_welcome_to_firefox
		ordering: 0
		image-res: ic_firefox
		image-res: ic_addons_extensions
		primary-button-label: onboarding_term_of_service_agree_and_continue_button_label_2
		extra-data:
		term-of-service-data:
		@@ -167,7 +167,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: ic_addons_extensions
		primary-button-label: juno_onboarding_default_browser_positive_button
		secondary-button-label: juno_onboarding_default_browser_negative_button

		@@ -185,7 +185,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: ic_addons_extensions
		ordering: 10
		primary-button-label: juno_onboarding_add_search_widget_positive_button
		secondary-button-label: juno_onboarding_add_search_widget_negative_button
		@@ -204,7 +204,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: ic_addons_extensions
		ordering: 15
		primary-button-label: juno_onboarding_sign_in_positive_button
		secondary-button-label: juno_onboarding_sign_in_negative_button
		@@ -223,7 +223,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: ic_addons_extensions
		ordering: 20
		primary-button-label: juno_onboarding_enable_notifications_positive_button
		secondary-button-label: juno_onboarding_enable_notifications_negative_button
		@@ -292,7 +292,7 @@ features:
		enabled: false
		title: onboarding_marketing_title
		body: onboarding_marketing_body
		image-res: ic_onboarding_welcome
		image-res: ic_addons_extensions
		ordering: 40
		primary-button-label: onboarding_marketing_positive_button
		extra-data:
		@@ -409,7 +409,7 @@ objects:
		type: Image
		description: The resource id of the image to be displayed.
		# This should never be defaulted.
		default: ic_onboarding_welcome
		default: ic_addons_extensions
		ordering:
		type: Int
		description: Used to sequence the cards.

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

+13 −12

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ package org.mozilla.fenix.onboarding.view

		import io.mockk.every
		import io.mockk.mockk
		import mozilla.components.lib.crash.R as crashR
		import mozilla.components.service.nimbus.evalJexlSafe
		import org.junit.Assert.assertEquals
		import org.junit.Before
		@@ -580,7 +581,7 @@ val privacyCaption: Caption = mockk(relaxed = true)

		private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData(
		type = OnboardingPageUiData.Type.DEFAULT_BROWSER,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.drawable.mozac_lib_crash_notification,
		title = "default browser title",
		description = "default browser body",
		primaryButtonLabel = "default browser primary button text",
		@@ -589,7 +590,7 @@ private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData(
		)
		private val addSearchWidgetPageUiData = OnboardingPageUiData(
		type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.drawable.mozac_lib_crash_notification,
		title = "add search widget title",
		description = "add search widget body",
		primaryButtonLabel = "add search widget primary button text",
		@@ -598,7 +599,7 @@ private val addSearchWidgetPageUiData = OnboardingPageUiData(
		)
		private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData(
		type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.drawable.mozac_lib_crash_notification,
		title = "add search widget title",
		description = "add search widget body",
		primaryButtonLabel = "add search widget primary button text",
		@@ -607,7 +608,7 @@ private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData(
		)
		private val syncPageUiData = OnboardingPageUiData(
		type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.drawable.mozac_lib_crash_notification,
		title = "sync title",
		description = "sync body",
		primaryButtonLabel = "sync primary button text",
		@@ -616,7 +617,7 @@ private val syncPageUiData = OnboardingPageUiData(
		)
		private val syncPageUiDataWithPrivacyCaption = OnboardingPageUiData(
		type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.drawable.mozac_lib_crash_notification,
		title = "sync title",
		description = "sync body",
		primaryButtonLabel = "sync primary button text",
		@@ -641,7 +642,7 @@ private val toolbarPageUiData = OnboardingPageUiData(
		)
		private val notificationPageUiData = OnboardingPageUiData(
		type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.drawable.mozac_lib_crash_notification,
		title = "notification title",
		description = "notification body",
		primaryButtonLabel = "notification primary button text",
		@@ -651,7 +652,7 @@ private val notificationPageUiData = OnboardingPageUiData(

		private val defaultBrowserCardData = OnboardingCardData(
		cardType = OnboardingCardType.DEFAULT_BROWSER,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.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 +664,7 @@ private val defaultBrowserCardData = OnboardingCardData(

		private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData(
		cardType = OnboardingCardType.DEFAULT_BROWSER,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.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 +676,7 @@ private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData(

		private val addSearchWidgetCardDataNoConditions = OnboardingCardData(
		cardType = OnboardingCardType.ADD_SEARCH_WIDGET,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.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 +688,7 @@ private val addSearchWidgetCardDataNoConditions = OnboardingCardData(

		private val addSearchWidgetCardData = OnboardingCardData(
		cardType = OnboardingCardType.ADD_SEARCH_WIDGET,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.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 +698,7 @@ private val addSearchWidgetCardData = OnboardingCardData(

		private val syncCardData = OnboardingCardData(
		cardType = OnboardingCardType.SYNC_SIGN_IN,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.drawable.mozac_lib_crash_notification,
		title = StringHolder(null, "sync title"),
		body = StringHolder(null, "sync body"),
		primaryButtonLabel = StringHolder(null, "sync primary button text"),
		@@ -709,7 +710,7 @@ private val syncCardData = OnboardingCardData(

		private val notificationCardData = OnboardingCardData(
		cardType = OnboardingCardType.NOTIFICATION_PERMISSION,
		imageRes = R.drawable.mozac_lib_crash_notification,
		imageRes = crashR.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/debug/ic_launcher-web.webp

deleted100644 → 0

−50.5 KiB

Loading image diff...

mobile/android/fenix/app/src/main/ic_launcher-web.webp

deleted100644 → 0

−27 KiB

Loading image diff...

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NotificationManager.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import androidx.core.net.toUri
		import mozilla.components.concept.sync.Device
		import mozilla.components.concept.sync.TabData
		import mozilla.components.concept.sync.TabPrivacy
		import mozilla.components.lib.crash.R as crashR
		import mozilla.components.support.base.ids.SharedIdsHelper
		import mozilla.components.support.base.log.logger.Logger
		import org.mozilla.fenix.HomeActivity
		@@ -102,7 +103,7 @@ class NotificationManager(private val context: Context) {

		addExtras(Bundle().apply { putInt(TOTAL_TABS_CLOSED_EXTRA, totalCount) })

		setSmallIcon(R.drawable.ic_status_logo)
		setSmallIcon(crashR.drawable.mozac_lib_crash_notification)
		setWhen(System.currentTimeMillis())
		setAutoCancel(true)
		setDefaults(Notification.DEFAULT_VIBRATE or Notification.DEFAULT_SOUND)
		@@ -142,7 +143,7 @@ class NotificationManager(private val context: Context) {
		PendingIntent.getActivity(context, 0, intent, showReceivedTabsIntentFlags)

		val builder = NotificationCompat.Builder(context, RECEIVE_TABS_CHANNEL_ID)
		.setSmallIcon(R.drawable.ic_status_logo)
		.setSmallIcon(crashR.drawable.mozac_lib_crash_notification)
		.setSendTabTitle(context, device, tab)
		.setWhen(System.currentTimeMillis())
		.setContentText(tab.url)