Bug 1810912 - Use layer2 for all favicon backgrounds on homepage.

app/src/main/java/org/mozilla/fenix/compose/ThumbnailCard.kt

@@ -23,7 +23,6 @@ import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -31,7 +30,6 @@ import mozilla.components.browser.icons.compose.Loader
 import mozilla.components.browser.icons.compose.Placeholder
 import mozilla.components.browser.icons.compose.WithIcon
 import mozilla.components.concept.base.images.ImageLoadRequest
-import org.mozilla.fenix.R
 import org.mozilla.fenix.components.components
 import org.mozilla.fenix.theme.FirefoxTheme
 
@@ -54,7 +52,7 @@ fun ThumbnailCard(
     url: String,
     key: String,
     size: Dp = 108.dp,
-    backgroundColor: Color = colorResource(id = R.color.photonGrey20),
+    backgroundColor: Color = FirefoxTheme.colors.layer2,
     modifier: Modifier = Modifier,
     contentDescription: String? = null,
     contentScale: ContentScale = ContentScale.FillWidth,

app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt

@@ -200,7 +200,6 @@ private fun Thumbnail(
             url = tab.content.url,
             key = tab.id,
             size = LocalConfiguration.current.screenWidthDp.dp,
-            backgroundColor = FirefoxTheme.colors.layer2,
             modifier = Modifier.fillMaxSize(),
         )
 

app/src/main/java/org/mozilla/fenix/home/recentbookmarks/view/RecentBookmarks.kt

@@ -183,10 +183,7 @@ private fun RecentBookmarkImage(bookmark: RecentBookmark) {
                 WithIcon { icon ->
                     Box(
                         modifier = imageModifier.background(
-                            color = when (isSystemInDarkTheme()) {
+                            color = FirefoxTheme.colors.layer2,
-                                true -> PhotonColors.DarkGrey60
-                                false -> PhotonColors.LightGrey30
-                            },
                         ),
                         contentAlignment = Alignment.Center,
                     ) {