From 28928e4bddc1f12fefb37c73f74d06ad4d8bae20 Mon Sep 17 00:00:00 2001 From: Arturo Mejia Date: Fri, 7 Jan 2022 10:08:13 -0500 Subject: [PATCH] For #23104: Don't adjust the theme for the default wallpaper. --- .../org/mozilla/fenix/wallpapers/WallpaperManager.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperManager.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperManager.kt index e647b3c7b5..a8db0c5919 100644 --- a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperManager.kt +++ b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperManager.kt @@ -47,8 +47,10 @@ class WallpaperManager(private val settings: Settings) { AppCompatDelegate.MODE_NIGHT_NO } } else { - updateThemePreference(followDeviceTheme = true) - AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM + // For the default wallpaper, there is not need to adjust the theme, + // as we want to allow users decide which theme they want to have. + // The default wallpaper adapts to whichever theme the user has. + return } if (AppCompatDelegate.getDefaultNightMode() != mode) { @@ -59,12 +61,10 @@ class WallpaperManager(private val settings: Settings) { private fun updateThemePreference( useDarkTheme: Boolean = false, - useLightTheme: Boolean = false, - followDeviceTheme: Boolean = false + useLightTheme: Boolean = false ) { settings.shouldUseDarkTheme = useDarkTheme settings.shouldUseLightTheme = useLightTheme - settings.shouldFollowDeviceTheme = followDeviceTheme } /**