Bug 1936272 - Disable new composable Bookmarks in UI tests r=ohorvath

Disable the new composable Bookmarks in UI tests to avoid any future failures.
This will also help separate the old tests from the new ones that I'll start creating.

Differential Revision: https://phabricator.services.mozilla.com/D231681

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelper.kt

@@ -93,6 +93,11 @@ interface FeatureSettingsHelper {
      */
     var isMenuRedesignCFREnabled: Boolean
 
+    /**
+     * Enable or disable the new bookmarks UI.
+     */
+    var isNewBookmarksEnabled: Boolean
+
     /**
      * Enable or disable the new microsurvey feature.
      */

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/FeatureSettingsHelperDelegate.kt

@@ -45,6 +45,7 @@ class FeatureSettingsHelperDelegate() : FeatureSettingsHelper {
         isNavigationToolbarEnabled = settings.navigationToolbarEnabled,
         isMenuRedesignEnabled = settings.enableMenuRedesign,
         isMenuRedesignCFREnabled = settings.shouldShowMenuCFR,
+        isNewBookmarksEnabled = settings.useNewBookmarks,
         isMicrosurveyEnabled = settings.microsurveyFeatureEnabled,
         isSetAsDefaultBrowserPromptEnabled = settings.setAsDefaultBrowserPromptForExistingUsersEnabled,
         shouldUseBottomToolbar = settings.shouldUseBottomToolbar,
@@ -79,6 +80,7 @@ class FeatureSettingsHelperDelegate() : FeatureSettingsHelper {
     override var isNavigationToolbarEnabled: Boolean by updatedFeatureFlags::isNavigationToolbarEnabled
     override var isMenuRedesignEnabled: Boolean by updatedFeatureFlags::isMenuRedesignEnabled
     override var isMenuRedesignCFREnabled: Boolean by updatedFeatureFlags::isMenuRedesignCFREnabled
+    override var isNewBookmarksEnabled: Boolean by updatedFeatureFlags::isNewBookmarksEnabled
     override var isMicrosurveyEnabled: Boolean by updatedFeatureFlags::isMicrosurveyEnabled
     override var isSetAsDefaultBrowserPromptEnabled: Boolean by updatedFeatureFlags::isSetAsDefaultBrowserPromptEnabled
     override var shouldUseBottomToolbar: Boolean by updatedFeatureFlags::shouldUseBottomToolbar
@@ -112,6 +114,7 @@ class FeatureSettingsHelperDelegate() : FeatureSettingsHelper {
         settings.navigationToolbarEnabled = featureFlags.isNavigationToolbarEnabled
         settings.enableMenuRedesign = featureFlags.isMenuRedesignEnabled
         settings.shouldShowMenuCFR = featureFlags.isMenuRedesignCFREnabled
+        settings.useNewBookmarks = featureFlags.isNewBookmarksEnabled
         settings.microsurveyFeatureEnabled = featureFlags.isMicrosurveyEnabled
         settings.setAsDefaultBrowserPromptForExistingUsersEnabled = featureFlags.isSetAsDefaultBrowserPromptEnabled
         settings.shouldUseBottomToolbar = featureFlags.shouldUseBottomToolbar
@@ -137,6 +140,7 @@ private data class FeatureFlags(
     var isNavigationToolbarEnabled: Boolean,
     var isMenuRedesignEnabled: Boolean,
     var isMenuRedesignCFREnabled: Boolean,
+    var isNewBookmarksEnabled: Boolean,
     var isMicrosurveyEnabled: Boolean,
     var isSetAsDefaultBrowserPromptEnabled: Boolean,
     var shouldUseBottomToolbar: Boolean,

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/helpers/HomeActivityTestRule.kt

@@ -67,6 +67,7 @@ class HomeActivityTestRule(
         isNavigationToolbarEnabled: Boolean = false,
         isMenuRedesignEnabled: Boolean = false,
         isMenuRedesignCFREnabled: Boolean = false,
+        isNewBookmarksEnabled: Boolean = false,
         isMicrosurveyEnabled: Boolean = settings.microsurveyFeatureEnabled,
         isSetAsDefaultBrowserPromptEnabled: Boolean = settings.setAsDefaultBrowserPromptForExistingUsersEnabled,
         shouldUseBottomToolbar: Boolean = settings.shouldUseBottomToolbar,
@@ -86,6 +87,7 @@ class HomeActivityTestRule(
         this.isNavigationToolbarEnabled = isNavigationToolbarEnabled
         this.isMenuRedesignEnabled = isMenuRedesignEnabled
         this.isMenuRedesignCFREnabled = isMenuRedesignCFREnabled
+        this.isNewBookmarksEnabled = isNewBookmarksEnabled
         this.isMicrosurveyEnabled = isMicrosurveyEnabled
         this.isSetAsDefaultBrowserPromptEnabled = isSetAsDefaultBrowserPromptEnabled
         this.shouldUseBottomToolbar = shouldUseBottomToolbar
@@ -190,6 +192,7 @@ class HomeActivityIntentTestRule internal constructor(
         isNavigationToolbarEnabled: Boolean = false,
         isMenuRedesignEnabled: Boolean = false,
         isMenuRedesignCFREnabled: Boolean = false,
+        isNewBookmarksEnabled: Boolean = false,
         isMicrosurveyEnabled: Boolean = settings.microsurveyFeatureEnabled,
         isSetAsDefaultBrowserPromptEnabled: Boolean = settings.setAsDefaultBrowserPromptForExistingUsersEnabled,
         shouldUseBottomToolbar: Boolean = settings.shouldUseBottomToolbar,
@@ -209,6 +212,7 @@ class HomeActivityIntentTestRule internal constructor(
         this.isNavigationToolbarEnabled = isNavigationToolbarEnabled
         this.isMenuRedesignEnabled = isMenuRedesignEnabled
         this.isMenuRedesignCFREnabled = isMenuRedesignCFREnabled
+        this.isNewBookmarksEnabled = isNewBookmarksEnabled
         this.isMicrosurveyEnabled = isMicrosurveyEnabled
         this.isSetAsDefaultBrowserPromptEnabled = isSetAsDefaultBrowserPromptEnabled
         this.shouldUseBottomToolbar = shouldUseBottomToolbar
@@ -282,6 +286,7 @@ class HomeActivityIntentTestRule internal constructor(
         isNavigationToolbarEnabled = settings.navigationToolbarEnabled
         isMenuRedesignEnabled = settings.enableMenuRedesign
         isMenuRedesignCFREnabled = settings.shouldShowMenuCFR
+        isNewBookmarksEnabled = settings.useNewBookmarks
         isMicrosurveyEnabled = settings.microsurveyFeatureEnabled
         isSetAsDefaultBrowserPromptEnabled = settings.setAsDefaultBrowserPromptForExistingUsersEnabled
         shouldUseBottomToolbar = settings.shouldUseBottomToolbar

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt

@@ -2234,7 +2234,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
     /**
      * Indicates whether or not we should use the new bookmarks UI.
      */
-    val useNewBookmarks by lazyFeatureFlagPreference(
+    var useNewBookmarks by lazyFeatureFlagPreference(
         key = appContext.getPreferenceKey(R.string.pref_key_use_new_bookmarks_ui),
         default = { FxNimbus.features.bookmarks.value().newComposeUi },
         featureFlag = true,