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

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ features:
		card-type: terms-of-service
		ordering: 1
		title: onboarding_welcome_to_firefox
		image-res: nova_onboarding_tou
		image-res: ic_autoplay
		primary-button-label: nova_onboarding_continue_button
		extra-data:
		term-of-service-data:
		@@ -42,7 +42,7 @@ features:
		ordering: 10
		title: nova_onboarding_set_to_default_title_2
		body: nova_onboarding_set_to_default_subtitle
		image-res: nova_onboarding_set_to_default
		image-res: ic_autoplay
		primary-button-label: nova_onboarding_set_to_default_button
		secondary-button-label: nova_onboarding_negative_button

		@@ -51,7 +51,7 @@ features:
		ordering: 20
		title: nova_onboarding_add_search_widget_title
		body: nova_onboarding_add_search_widget_subtitle
		image-res: nova_onboarding_widget
		image-res: ic_autoplay
		primary-button-label: nova_onboarding_add_search_widget_button
		secondary-button-label: nova_onboarding_negative_button

		@@ -60,7 +60,7 @@ features:
		ordering: 30
		title: nova_onboarding_sync_title
		body: nova_onboarding_sync_subtitle
		image-res: nova_onboarding_sync
		image-res: ic_autoplay
		primary-button-label: nova_onboarding_sync_button
		secondary-button-label: nova_onboarding_negative_button

		@@ -69,7 +69,7 @@ features:
		ordering: 40
		title: nova_onboarding_notifications_title
		body: nova_onboarding_notifications_subtitle
		image-res: nova_onboarding_notifications
		image-res: ic_autoplay
		primary-button-label: nova_onboarding_notifications_button
		secondary-button-label: nova_onboarding_negative_button

		@@ -89,7 +89,7 @@ features:
		card-type: marketing-data
		ordering: 60
		title: nova_onboarding_marketing_title
		image-res: nova_onboarding_marketing
		image-res: ic_autoplay
		primary-button-label: nova_onboarding_continue_button
		secondary-button-label: nova_onboarding_marketing_secondary_button_text
		extra-data:
		@@ -150,7 +150,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_autoplay
		ordering:
		type: Int
		description: Used to sequence the cards.

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

+12 −11

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
		@@ -156,7 +157,7 @@ class OnboardingMapperTest {

		@Test
		fun termsOfServiceData_toPageUiData_returnsConvertedPage() {
		val imageRes = R.drawable.ic_firefox
		val imageRes = crashR.drawable.mozac_lib_crash_notification
		val title = "Terms of service card title"
		val description = "Terms of service card body"
		val primaryButtonLabel = "onboarding card primary button text"
		@@ -429,7 +430,7 @@ class OnboardingMapperTest {

		private val defaultBrowserPageUiData = 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",
		@@ -437,7 +438,7 @@ private val defaultBrowserPageUiData = 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",
		@@ -445,7 +446,7 @@ private val addSearchWidgetPageUiData = 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",
		@@ -468,7 +469,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",
		@@ -477,7 +478,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"),
		@@ -489,7 +490,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"),
		@@ -501,7 +502,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"),
		@@ -513,7 +514,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"),
		@@ -523,7 +524,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"),
		@@ -535,7 +536,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)