From 731e0411d0e7c142b44a131d3b43f7553d63a55b Mon Sep 17 00:00:00 2001
From: MatthewTighe <mtighe@mozilla.com>
Date: Wed, 7 Sep 2022 15:12:34 -0700
Subject: [PATCH] [fenix] Closes
 https://github.com/mozilla-mobile/fenix/issues/26870: remove layer behind
 wallpaper thumbnails

---
 .../settings/wallpaper/WallpaperSettings.kt   | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt b/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt
index 492be47748..64a4a337ce 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt
@@ -159,28 +159,26 @@ private fun WallpaperThumbnails(
     numColumns: Int = 3,
     onSelectWallpaper: (Wallpaper) -> Unit,
 ) {
-    Surface(color = FirefoxTheme.colors.layer2) {
-        Column(modifier = Modifier.padding(vertical = 30.dp, horizontal = 20.dp)) {
-            val numRows = (wallpapers.size + numColumns - 1) / numColumns
-            for (rowIndex in 0 until numRows) {
-                Row {
-                    for (columnIndex in 0 until numColumns) {
-                        val itemIndex = rowIndex * numColumns + columnIndex
-                        if (itemIndex < wallpapers.size) {
-                            Box(
-                                modifier = Modifier.weight(1f, fill = true).padding(4.dp),
-                            ) {
-                                WallpaperThumbnailItem(
-                                    wallpaper = wallpapers[itemIndex],
-                                    defaultWallpaper = defaultWallpaper,
-                                    loadWallpaperResource = loadWallpaperResource,
-                                    isSelected = selectedWallpaper == wallpapers[itemIndex],
-                                    onSelect = onSelectWallpaper
-                                )
-                            }
-                        } else {
-                            Spacer(Modifier.weight(1f))
+    Column(modifier = Modifier.padding(vertical = 30.dp, horizontal = 20.dp)) {
+        val numRows = (wallpapers.size + numColumns - 1) / numColumns
+        for (rowIndex in 0 until numRows) {
+            Row {
+                for (columnIndex in 0 until numColumns) {
+                    val itemIndex = rowIndex * numColumns + columnIndex
+                    if (itemIndex < wallpapers.size) {
+                        Box(
+                            modifier = Modifier.weight(1f, fill = true).padding(4.dp),
+                        ) {
+                            WallpaperThumbnailItem(
+                                wallpaper = wallpapers[itemIndex],
+                                defaultWallpaper = defaultWallpaper,
+                                loadWallpaperResource = loadWallpaperResource,
+                                isSelected = selectedWallpaper == wallpapers[itemIndex],
+                                onSelect = onSelectWallpaper
+                            )
                         }
+                    } else {
+                        Spacer(Modifier.weight(1f))
                     }
                 }
             }