Skip to content
Snippets Groups Projects
Commit ce443546 authored by clairehurst's avatar clairehurst Committed by Beatriz Rizental
Browse files

[android] Delete unused media

parent c9876688
Branches
Tags
1 merge request!1507Rebase Tor Browser onto 136.0a1
Showing
with 48 additions and 34 deletions
mobile/android/fenix/app/src/debug/ic_launcher-web.webp

26.2 KiB

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

27 KiB

......@@ -112,7 +112,7 @@ class NotificationManager(private val context: Context) {
val extras = bundleOf(TOTAL_TABS_CLOSED_EXTRA to totalCount)
addExtras(extras)
setSmallIcon(R.drawable.ic_status_logo)
setSmallIcon(R.drawable.mozac_lib_crash_notification)
setWhen(System.currentTimeMillis())
setAutoCancel(true)
setDefaults(Notification.DEFAULT_VIBRATE or Notification.DEFAULT_SOUND)
......@@ -145,7 +145,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(R.drawable.mozac_lib_crash_notification)
.setSendTabTitle(context, device, tab)
.setWhen(System.currentTimeMillis())
.setContentText(tab.url)
......
......
......@@ -26,7 +26,7 @@ import org.mozilla.fenix.ext.components
*/
class BrowserMenuSignIn(
@ColorRes private val textColorResource: Int,
@DrawableRes imageResource: Int = R.drawable.ic_signed_out,
@DrawableRes imageResource: Int = R.drawable.mozac_lib_crash_notification,
listener: () -> Unit = {},
) : BrowserMenuImageText(
String(),
......
......
......@@ -376,7 +376,7 @@ open class DefaultToolbarMenu(
primaryTextColor()
},
highlight = BrowserMenuHighlight.HighPriority(
endImageResource = R.drawable.ic_sync_disconnected,
endImageResource = R.drawable.mozac_lib_crash_notification,
backgroundTint = context.getColorFromAttr(R.attr.syncDisconnectedBackground),
canPropagate = false,
),
......
......
......@@ -59,7 +59,7 @@ class PoweredByNotification(
with(applicationContext) {
val appName = getString(R.string.app_name)
return NotificationCompat.Builder(this, channelId)
.setSmallIcon(R.drawable.ic_status_logo)
.setSmallIcon(R.drawable.mozac_lib_crash_notification)
.setContentTitle(applicationContext.getString(R.string.browser_menu_powered_by2, appName))
.setBadgeIconType(BADGE_ICON_NONE)
.setColor(ContextCompat.getColor(this, R.color.primary_text_light_theme))
......
......
......@@ -119,10 +119,11 @@ fun ResearchSurfaceSurvey(
modifier = Modifier.padding(horizontal = 16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Image(
painter = painterResource(R.drawable.ic_firefox),
contentDescription = null,
)
// Removed as part of tor-browser#42386
// Image(
// painter = painterResource(R.drawable.ic_firefox),
// contentDescription = null,
// )
Spacer(modifier = Modifier.height(16.dp))
Text(
text = messageText,
......
......
......@@ -80,7 +80,7 @@ class HomeMenu(
private val reconnectToSyncItem by lazy {
BrowserMenuHighlightableItem(
context.getString(R.string.sync_reconnect),
R.drawable.ic_sync_disconnected,
R.drawable.mozac_lib_crash_notification,
iconTintColorResource = syncDisconnectedColor,
textColorResource = primaryTextColor,
highlight = BrowserMenuHighlight.HighPriority(
......
......
......@@ -604,7 +604,7 @@ fun PoweredByPocketHeader(
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
painter = painterResource(id = R.drawable.pocket_vector),
painter = painterResource(id = R.drawable.mozac_lib_crash_notification),
contentDescription = null,
// Apply the red tint in code. Otherwise the image is black and white.
tint = Color(0xFFEF4056),
......
......
......@@ -151,7 +151,7 @@ fun RecentSyncedTab(
)
} else {
Image(
painter = painterResource(R.drawable.ic_synced_tabs),
painter = painterResource(R.drawable.mozac_lib_crash_notification),
contentDescription = stringResource(
R.string.recent_tabs_synced_device_icon_content_description,
),
......
......
......@@ -40,7 +40,7 @@ class PagerIndicator : LinearLayout {
val isLast = i == size - 1
addView(
View(context).apply {
setBackgroundResource(R.drawable.pager_dot)
setBackgroundResource(R.drawable.mozac_lib_crash_notification)
isSelected = i == selectedIndex
},
LayoutParams(dpToPx(DOT_SIZE_IN_DP), dpToPx(DOT_SIZE_IN_DP)).apply {
......
......
......@@ -141,7 +141,7 @@ class TopSiteItemViewHolder(
} else {
when (topSite.url) {
SupportUtils.POCKET_TRENDING_URL -> {
binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_pocket))
binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.mozac_lib_crash_notification))
}
SupportUtils.BAIDU_URL -> {
binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_baidu))
......
......
......@@ -430,7 +430,7 @@ private fun FaviconImage(painter: Painter) {
@Composable
private fun TopSiteFavicon(url: String, imageUrl: String? = null) {
when (url) {
SupportUtils.POCKET_TRENDING_URL -> FaviconImage(painterResource(R.drawable.ic_pocket))
SupportUtils.POCKET_TRENDING_URL -> FaviconImage(painterResource(R.drawable.mozac_lib_crash_notification))
SupportUtils.BAIDU_URL -> FaviconImage(painterResource(R.drawable.ic_baidu))
SupportUtils.JD_URL -> FaviconImage(painterResource(R.drawable.ic_jd))
SupportUtils.PDD_URL -> FaviconImage(painterResource(R.drawable.ic_pdd))
......
......
......@@ -62,7 +62,7 @@ fun MicrosurveyCompleted(
Row {
Image(
painter = painterResource(R.drawable.microsurvey_success),
painter = painterResource(R.drawable.mozac_lib_crash_notification),
contentDescription = null,
contentScale = ContentScale.None,
)
......
......
......@@ -54,11 +54,12 @@ fun MicrosurveyHeader(
.weight(1f, fill = false)
.padding(start = 32.dp),
) {
Image(
painter = painterResource(R.drawable.ic_firefox),
contentDescription = stringResource(id = R.string.microsurvey_app_icon_content_description),
modifier = Modifier.size(24.dp),
)
// Removed as part of tor-browser#42386
// Image(
// painter = painterResource(R.drawable.ic_firefox),
// contentDescription = stringResource(id = R.string.microsurvey_app_icon_content_description),
// modifier = Modifier.size(24.dp),
// )
Spacer(modifier = Modifier.width(8.dp))
Text(
text = title,
......
......
......@@ -102,11 +102,12 @@ private fun Header(
onCloseButtonClicked: () -> Unit,
) {
Row(modifier = Modifier.fillMaxWidth()) {
Image(
painter = painterResource(R.drawable.ic_firefox),
contentDescription = stringResource(id = R.string.microsurvey_app_icon_content_description),
modifier = Modifier.size(24.dp),
)
// Removed as part of tor-browser#42386
// Image(
// painter = painterResource(R.drawable.ic_firefox),
// contentDescription = stringResource(id = R.string.microsurvey_app_icon_content_description),
// modifier = Modifier.size(24.dp),
// )
Spacer(modifier = Modifier.width(8.dp))
......
......
......@@ -172,7 +172,7 @@ private fun MarketingDataOnboardingPagePreview() {
FirefoxTheme {
MarketingDataOnboardingPage(
state = OnboardingPageState(
imageRes = R.drawable.ic_onboarding_welcome,
imageRes = R.drawable.mozac_lib_crash_notification,
title = stringResource(id = R.string.onboarding_marketing_title),
description = stringResource(id = R.string.onboarding_marketing_body),
primaryButton = Action(
......
......
......@@ -189,7 +189,9 @@ private fun OnboardingPagePreview() {
FirefoxTheme {
OnboardingPage(
pageState = OnboardingPageState(
imageRes = R.drawable.ic_notification_permission,
// Removed to reduce APK size as part of https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42386
// Set to something else to make the compiler happy
imageRes = R.drawable.mozac_lib_crash_notification,
title = stringResource(
id = R.string.onboarding_home_welcome_title_2,
formatArgs = arrayOf(stringResource(R.string.app_name)),
......
......
......@@ -438,7 +438,9 @@ private fun OnboardingScreenPreview() {
private fun defaultPreviewPages() = listOf(
OnboardingPageUiData(
type = OnboardingPageUiData.Type.DEFAULT_BROWSER,
imageRes = R.drawable.ic_onboarding_welcome,
// Removed to reduce APK size as part of https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42386
// Set to something else to make the compiler happy
imageRes = R.drawable.mozac_lib_crash_notification,
title = stringResource(R.string.juno_onboarding_default_browser_title_nimbus_2),
description = stringResource(R.string.juno_onboarding_default_browser_description_nimbus_3),
primaryButtonLabel = stringResource(R.string.juno_onboarding_default_browser_positive_button),
......@@ -454,7 +456,9 @@ private fun defaultPreviewPages() = listOf(
),
OnboardingPageUiData(
type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
imageRes = R.drawable.ic_onboarding_sync,
// Removed to reduce APK size as part of https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42386
// Set to something else to make the compiler happy
imageRes = R.drawable.mozac_lib_crash_notification,
title = stringResource(R.string.juno_onboarding_sign_in_title_2),
description = stringResource(R.string.juno_onboarding_sign_in_description_3),
primaryButtonLabel = stringResource(R.string.juno_onboarding_sign_in_positive_button),
......@@ -470,7 +474,9 @@ private fun defaultPreviewPages() = listOf(
),
OnboardingPageUiData(
type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,
imageRes = R.drawable.ic_notification_permission,
// Removed to reduce APK size as part of https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42386
// Set to something else to make the compiler happy
imageRes = R.drawable.mozac_lib_crash_notification,
title = stringResource(R.string.juno_onboarding_enable_notifications_title_nimbus_2),
description = stringResource(R.string.juno_onboarding_enable_notifications_description_nimbus_2),
primaryButtonLabel = stringResource(R.string.juno_onboarding_enable_notifications_positive_button),
......
......
......@@ -69,7 +69,9 @@ fun UpgradeOnboarding(
OnboardingPage(
pageState = when (onboardingState) {
UpgradeOnboardingState.Welcome -> OnboardingPageState(
imageRes = R.drawable.ic_onboarding_welcome,
// Removed to reduce APK size as part of https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42386
// Set to something else to make the compiler happy
imageRes = R.drawable.mozac_lib_crash_notification,
title = stringResource(id = R.string.onboarding_home_welcome_title_2),
description = stringResource(id = R.string.onboarding_home_welcome_description),
primaryButton = Action(
......@@ -88,8 +90,9 @@ fun UpgradeOnboarding(
},
)
UpgradeOnboardingState.SyncSignIn -> OnboardingPageState(
imageRes = R.drawable.ic_onboarding_sync,
title = stringResource(id = R.string.onboarding_home_sync_title_3),
// Removed to reduce APK size as part of https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/42386
// Set to something else to make the compiler happy
imageRes = R.drawable.mozac_lib_crash_notification, title = stringResource(id = R.string.onboarding_home_sync_title_3),
description = stringResource(id = R.string.onboarding_home_sync_description),
primaryButton = Action(
text = stringResource(id = R.string.onboarding_home_sign_in_button),
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment