From da1c5b9bf7011ab1bf494182259f092ae0bcc42f Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 4 May 2022 14:10:57 -0400
Subject: [PATCH] For #25115 - Remove showWallpapers feature flag

---
 app/src/main/java/org/mozilla/fenix/FeatureFlags.kt         | 5 -----
 app/src/main/java/org/mozilla/fenix/FenixApplication.kt     | 6 ++----
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt    | 3 +--
 .../java/org/mozilla/fenix/settings/HomeSettingsFragment.kt | 1 -
 app/src/main/java/org/mozilla/fenix/utils/Settings.kt       | 5 ++---
 app/src/main/res/xml/home_preferences.xml                   | 3 +--
 6 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index b04d4db9e..701364229 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -72,11 +72,6 @@ object FeatureFlags {
      */
     const val showClearSiteData = true
 
-    /**
-     * Enables showing the wallpaper functionality.
-     */
-    const val showWallpapers = true
-
     /**
      * Enables history improvement features.
      */
diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index eb9c364bb..9d29050bd 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -796,10 +796,8 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
 
     @OptIn(DelicateCoroutinesApi::class)
     open fun downloadWallpapers() {
-        if (FeatureFlags.showWallpapers) {
-            GlobalScope.launch {
-                components.wallpaperManager.downloadAllRemoteWallpapers()
-            }
+        GlobalScope.launch {
+            components.wallpaperManager.downloadAllRemoteWallpapers()
         }
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index cfd9cb569..d05cb28cc 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -1073,8 +1073,7 @@ class HomeFragment : Fragment() {
     }
 
     private fun shouldEnableWallpaper() =
-        FeatureFlags.showWallpapers &&
-            (activity as? HomeActivity)?.themeManager?.currentTheme?.isPrivate?.not() ?: false
+        (activity as? HomeActivity)?.themeManager?.currentTheme?.isPrivate?.not() ?: false
 
     companion object {
         const val ALL_NORMAL_TABS = "all_normal"
diff --git a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt
index 52ac05bfb..eac5e8713 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/HomeSettingsFragment.kt
@@ -147,7 +147,6 @@ class HomeSettingsFragment : PreferenceFragmentCompat() {
                 )
                 true
             }
-            isVisible = FeatureFlags.showWallpapers
         }
 
         addToRadioGroup(
diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 7e1f3b7a3..2b252821c 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -434,10 +434,9 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      * Indicates if the Firefox logo on the home screen should be animated,
      * to show users that they can change the wallpaper by tapping on the Firefox logo.
      */
-    var shouldAnimateFirefoxLogo by featureFlagPreference(
+    var shouldAnimateFirefoxLogo by booleanPreference(
         appContext.getPreferenceKey(R.string.pref_key_show_logo_animation),
-        default = FeatureFlags.showWallpapers,
-        featureFlag = FeatureFlags.showWallpapers
+        default = true,
     )
 
     /**
diff --git a/app/src/main/res/xml/home_preferences.xml b/app/src/main/res/xml/home_preferences.xml
index 1651fb15f..975919a69 100644
--- a/app/src/main/res/xml/home_preferences.xml
+++ b/app/src/main/res/xml/home_preferences.xml
@@ -37,8 +37,7 @@
 
     <androidx.preference.Preference
         android:key="@string/pref_key_wallpapers"
-        android:title="@string/customize_wallpapers"
-        app:isPreferenceVisible="false" />
+        android:title="@string/customize_wallpapers" />
 
     <androidx.preference.PreferenceCategory
         android:layout="@layout/preference_cat_style"