Skip to content

S2s initial branch files #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fmasalha wants to merge 1 commit into from
+23 −0
Closed

S2s initial branch files #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,12 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
onPreferenceChangeListener = SharedPreferenceUpdater()
}

requirePreference<SwitchPreference>(R.string.pref_key_enable_shake_to_summarize).apply {
isVisible = Config.channel.isDebug
isChecked = context.settings().shakeToSummarizeFeatureEnabled
onPreferenceChangeListener = SharedPreferenceUpdater()
}

requirePreference<SwitchPreference>(R.string.pref_key_persistent_debug_menu).apply {
isVisible = true
isChecked = context.settings().isDebugMenuPersistentlyRevealed
Expand Down
8 changes: 8 additions & 0 deletions mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2547,6 +2547,14 @@ class Settings(
default = { FxNimbus.features.microsurveys.value().enabled },
)

/**
* Indicates if the Shake to Summarize feature is enabled.
*/
var shakeToSummarizeFeatureEnabled by booleanPreference(
key = appContext.getPreferenceKey(R.string.pref_key_enable_shake_to_summarize),
default = Config.channel.isDebug,
)

/**
* Indicates if a microsurvey should be shown to the user.
*/
Expand Down
2 changes: 2 additions & 0 deletions mobile/android/fenix/app/src/main/res/values/preference_keys.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,8 @@
<string name="pref_key_enable_isolated_process" translatable="false">pref_key_enable_isolated_process</string>
<string name="pref_key_enable_app_zygote_process" translatable="false">pref_key_enable_app_zygote_process</string>
<string name="pref_key_enable_persistent_onboarding" translatable="false">pref_key_enable_persistent_onboarding</string>
<string name="pref_key_enable_shake_to_summarize" translatable="false">pref_key_enable_shake_to_summarize</string>


<!-- Logins -->
<string name="pref_key_enable_compose_logins" translatable="false">pref_key_enable_compose_logins</string>
Expand Down
2 changes: 2 additions & 0 deletions mobile/android/fenix/app/src/main/res/values/static_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@
<string name="preferences_debug_crash_dialog_preview" translatable="false">Enable New Crash Flow</string>
<!-- Label for enabling the microsurvey feature -->
<string name="preferences_debug_settings_microsurvey_feature" translatable="false">Enable Microsurvey Feature</string>
<!-- Label for enabling shake to summarize -->
<string name="preferences_key_enable_shake_to_summarize" translatable="false">Enable Shake to Summarize Feature</string>
<!-- Label for enabling Unified Trust Panel -->
<string name="preferences_debug_settings_unified_trust_panel" translatable="false">Enable Unified Trust Panel</string>
<!-- Label for enabling remote search configuration -->
Expand Down
5 changes: 5 additions & 0 deletions mobile/android/fenix/app/src/main/res/xml/secret_settings_preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@
android:key="@string/pref_key_microsurvey_feature_enabled"
android:title="@string/preferences_debug_settings_microsurvey_feature"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="false"
android:key="@string/pref_key_enable_shake_to_summarize"
android:title="@string/preferences_key_enable_shake_to_summarize"
app:iconSpaceReserved="false" />
<SwitchPreference
android:key="@string/pref_key_doh_settings_enabled"
android:title="@string/preferences_debug_settings_enable_doh_settings"
Expand Down