From f734509ac4f911338b87065e641bc956a6623536 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Wed, 26 Aug 2020 09:53:22 -0700 Subject: [PATCH] No Issue - Removes pref, toggles new search based on feature flag only --- .../fenix/components/toolbar/BrowserToolbarController.kt | 3 ++- app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 5 +++-- .../org/mozilla/fenix/settings/SecretSettingsFragment.kt | 6 ------ app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 6 ------ app/src/main/res/values/preference_keys.xml | 2 -- app/src/main/res/values/static_strings.xml | 2 -- app/src/main/res/xml/secret_settings_preferences.xml | 5 ----- 7 files changed, 5 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt index 0d8ede070..9e0896ec6 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt @@ -23,6 +23,7 @@ import mozilla.components.concept.engine.prompt.ShareData import mozilla.components.feature.session.SessionFeature import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.kotlin.isUrl +import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.NavGraphDirections import org.mozilla.fenix.R @@ -79,7 +80,7 @@ class DefaultBrowserToolbarController( ) : BrowserToolbarController { private val useNewSearchExperience - get() = activity.settings().useNewSearchExperience + get() = FeatureFlags.newSearchExperience private val currentSession get() = customTabSession ?: activity.components.core.sessionManager.selectedSession 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 6f3cfcdcf..448e0d7ca 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -74,6 +74,7 @@ import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.android.util.dpToPx import org.mozilla.fenix.BrowserDirection +import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions @@ -444,7 +445,7 @@ class HomeFragment : Fragment() { updateTabCounter(requireComponents.core.store.state) - if (args.focusOnAddressBar && requireContext().settings().useNewSearchExperience) { + if (args.focusOnAddressBar && FeatureFlags.newSearchExperience) { navigateToSearch() } } @@ -705,7 +706,7 @@ class HomeFragment : Fragment() { } private fun navigateToSearch() { - val directions = if (requireContext().settings().useNewSearchExperience) { + val directions = if (FeatureFlags.newSearchExperience) { HomeFragmentDirections.actionGlobalSearchDialog( sessionId = null ) diff --git a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt index 4e06e5661..4fcfa280f 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt @@ -25,12 +25,6 @@ class SecretSettingsFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.secret_settings_preferences, rootKey) - requirePreference(R.string.pref_key_use_new_search_experience).apply { - isVisible = FeatureFlags.newSearchExperience - isChecked = context.settings().useNewSearchExperience - onPreferenceChangeListener = SharedPreferenceUpdater() - } - requirePreference(R.string.pref_key_enable_top_frecent_sites).apply { isVisible = FeatureFlags.topFrecentSite isChecked = context.settings().showTopFrecentSites 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 690dc8a10..e4fb1892e 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -98,12 +98,6 @@ class Settings(private val appContext: Context) : PreferencesHolder { override val preferences: SharedPreferences = appContext.getSharedPreferences(FENIX_PREFERENCES, MODE_PRIVATE) - var useNewSearchExperience by featureFlagPreference( - appContext.getPreferenceKey(R.string.pref_key_use_new_search_experience), - default = false, - featureFlag = FeatureFlags.newSearchExperience - ) - var showTopFrecentSites by featureFlagPreference( appContext.getPreferenceKey(R.string.pref_key_enable_top_frecent_sites), default = false, diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index a7af0f00c..a84532b30 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -181,8 +181,6 @@ pref_key_migrating_from_firefox_nightly_tip pref_key_migrating_from_fenix_tip - pref_key_use_new_search_experience - pref_key_wait_first_paint pref_key_synced_tabs_tabs_tray diff --git a/app/src/main/res/values/static_strings.xml b/app/src/main/res/values/static_strings.xml index 975270daa..24cdc95f6 100644 --- a/app/src/main/res/values/static_strings.xml +++ b/app/src/main/res/values/static_strings.xml @@ -32,8 +32,6 @@ Secret Settings - - Use New Search Experience Show Top Frequently Visited Sites diff --git a/app/src/main/res/xml/secret_settings_preferences.xml b/app/src/main/res/xml/secret_settings_preferences.xml index 0a43e3609..3a20cef48 100644 --- a/app/src/main/res/xml/secret_settings_preferences.xml +++ b/app/src/main/res/xml/secret_settings_preferences.xml @@ -4,11 +4,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -