corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1954785 - Add secret settings and nimbus flag for search using remote servers r=android-reviewers,Roger

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D245122
This commit is contained in:
sarah541
2025-04-11 15:08:40 +00:00
parent da07859113
commit 105271d1d6
6 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/android/fenix/app/nimbus.fml.yaml
View File

@@ -770,6 +770,14 @@ features:
description: The text to show in the CFR
type: Text
default: ""
remote-search-configuration:
description: Feature to use search configurations from remote servers.
variables:
enabled:
description: >
Uses search configuration from remote servers .
type: Boolean
default: false
types:
objects: {}

6
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
View File

@@ -236,6 +236,12 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
}
}
requirePreference<SwitchPreference>(R.string.pref_key_use_remote_search_configuration).apply {
isVisible = true
isChecked = context.settings().useRemoteSearchConfiguration
onPreferenceChangeListener = SharedPreferenceUpdater()
}
requirePreference<SwitchPreference>(R.string.pref_key_microsurvey_feature_enabled).apply {
isVisible = true
isChecked = context.settings().microsurveyFeatureEnabled

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

@@ -1914,6 +1914,14 @@ class Settings(private val appContext: Context) : PreferencesHolder {
default = true,
)
/**
* Indicates whether or not to use remote server search configuration.
*/
var useRemoteSearchConfiguration by booleanPreference(
key = appContext.getPreferenceKey(R.string.pref_key_use_remote_search_configuration),
default = FxNimbus.features.remoteSearchConfiguration.value().enabled,
)
/**
* Indicates if the menu CFR should be displayed to the user.
*/

2
mobile/android/fenix/app/src/main/res/values/preference_keys.xml
View File

@@ -135,6 +135,8 @@
<string name="pref_key_show_sponsored_suggestions" translatable="false">pref_key_show_sponsored_suggestions</string>
<string name="pref_key_show_nonsponsored_suggestions" translatable="false">pref_key_show_nonsponsored_suggestions</string>
<string name="pref_key_learn_about_fx_suggest" translatable="false">pref_key_learn_about_fx_suggest</string>
<string name="pref_key_use_remote_search_configuration" translatable="false">pref_key_use_remote_search_configuration</string>
<!-- Searchbar Settings -->
<string name="pref_key_should_searchbar_cfr">pref_key_should_show_searchbar_cfr</string>

2
mobile/android/fenix/app/src/main/res/values/static_strings.xml
View File

@@ -107,6 +107,8 @@
<string name="preferences_debug_settings_unified_trust_panel" translatable="false">Enable Unified Trust Panel</string>
<!-- Label for enabling Trending Searches -->
<string name="preferences_debug_settings_trending_searches" translatable="false">Enable Trending Searches</string>
<!-- Label for enabling remote search configuration -->
<string name="preferences_debug_settings_remote_search_configuration" translatable="false">Enable Remote Search Configuration (requires restart)</string>
<!-- Label for enabling Recent Searches -->
<string name="preferences_debug_settings_recent_searches" translatable="false">Enable Recent Searches</string>
<!-- Label for enabling Shortcut Suggestions -->

4
mobile/android/fenix/app/src/main/res/xml/secret_settings_preferences.xml
View File

@@ -92,6 +92,10 @@
android:key="@string/pref_key_enable_trending_searches"
android:title="@string/preferences_debug_settings_trending_searches"
app:iconSpaceReserved="false" />
<SwitchPreference
android:key="@string/pref_key_use_remote_search_configuration"
android:title="@string/preferences_debug_settings_remote_search_configuration"
app:iconSpaceReserved="false" />
<SwitchPreference
android:key="@string/pref_key_enable_recent_searches"
android:title="@string/preferences_debug_settings_recent_searches"