commit c91898ce4d64cbb444a5d36068ceabd05749252d parent ddb9058b8690714930324ef80baea38d62dd8b6b Author: Atila Butkovits <abutkovits@mozilla.com> Date: Tue, 23 Dec 2025 21:59:08 +0200 Revert "Bug 2007000 - remove unused flags r=android-reviewers,jonalmeida" for causing failures at test_trr_httpssvc_wrap.js. This reverts commit b380bf77d983e51d8a724604e06567cce7774e29. Diffstat:
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -23,6 +23,12 @@ object FeatureFlags { const val PULL_TO_REFRESH_ENABLED = true /** + * Enables new search settings UI with two extra fragments, for managing the default engine + * and managing search shortcuts in the quick search menu. + */ + const val UNIFIED_SEARCH_SETTINGS = true + + /** * Allows users to enable Firefox Suggest. */ const val FX_SUGGEST = true diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -724,6 +724,11 @@ class Settings( val shouldShowSecurityPinWarning: Boolean get() = secureWarningCount.underMaxCount() + var shouldShowPrivacyPopWindow by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_privacy_pop_window), + default = true, + ) + var shouldUseLightTheme by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_light_theme), default = false, @@ -2419,6 +2424,11 @@ class Settings( ) /** + * Indicates if the new Search settings UI is enabled. + */ + var enableUnifiedSearchSettingsUI: Boolean = showUnifiedSearchFeature && FeatureFlags.UNIFIED_SEARCH_SETTINGS + + /** * Indicates if hidden engines were restored due to migration to unified search settings UI. * Should be removed once we expect the majority of the users to migrate. * Tracking: https://bugzilla.mozilla.org/show_bug.cgi?id=1850767 diff --git a/mobile/android/fenix/app/src/main/res/values/preference_keys.xml b/mobile/android/fenix/app/src/main/res/values/preference_keys.xml @@ -183,6 +183,9 @@ <string name="pref_key_menu_cfr" translatable="false">pref_key_menu_cfr</string> <string name="pref_key_toolbar_cfr" translatable="false">pref_key_toolbar_cfr</string> + <!-- Privacy Pop Window --> + <string name="pref_key_privacy_pop_window" translatable="false">pref_key_privacy_pop_window</string> + <!-- Remote Server Settings --> <string name="pref_key_remote_server_prod" translatable="false">pref_key_remote_server_prod</string>