Commit e30d1051 authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

[android] Delete unused media

parent bca39984
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -29,7 +29,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:
@@ -46,7 +46,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

@@ -55,7 +55,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

@@ -64,7 +64,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

@@ -73,7 +73,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

@@ -93,7 +93,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:
@@ -154,7 +154,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.
+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 mozilla.components.support.utils.ManufacturerChecker
import org.junit.Assert.assertEquals
@@ -663,7 +664,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",
@@ -672,7 +673,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",
@@ -681,7 +682,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",
@@ -690,7 +691,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",
@@ -699,7 +700,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",
@@ -724,7 +725,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",
@@ -734,7 +735,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"),
@@ -746,7 +747,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"),
@@ -758,7 +759,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"),
@@ -770,7 +771,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"),
@@ -780,7 +781,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"),
@@ -792,7 +793,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"),
−50.5 KiB
Loading image diff...
−27 KiB
Loading image diff...
+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)
Loading