For #13052 - Creates new dialog fragment for search and puts it behind a feature flag
parent
17bb010cc3
commit
495341a945
|
@ -38,4 +38,9 @@ object FeatureFlags {
|
||||||
* Enables viewing tab history
|
* Enables viewing tab history
|
||||||
*/
|
*/
|
||||||
val tabHistory = Config.channel.isNightlyOrDebug
|
val tabHistory = Config.channel.isNightlyOrDebug
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enables the new search experience
|
||||||
|
*/
|
||||||
|
val newSearchExperience = Config.channel.isDebug
|
||||||
}
|
}
|
||||||
|
|
|
@ -673,9 +673,13 @@ class HomeFragment : Fragment() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun navigateToSearch() {
|
private fun navigateToSearch() {
|
||||||
val directions = HomeFragmentDirections.actionGlobalSearch(
|
val directions = if (requireContext().settings().useNewSearchExperience) {
|
||||||
|
HomeFragmentDirections.actionGlobalSearchDialog()
|
||||||
|
} else {
|
||||||
|
HomeFragmentDirections.actionGlobalSearch(
|
||||||
sessionId = null
|
sessionId = null
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
|
||||||
nav(R.id.homeFragment, directions, getToolbarNavOptions(requireContext()))
|
nav(R.id.homeFragment, directions, getToolbarNavOptions(requireContext()))
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
package org.mozilla.fenix.searchdialog
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import androidx.appcompat.app.AppCompatDialogFragment
|
||||||
|
import org.mozilla.fenix.R
|
||||||
|
|
||||||
|
class SearchDialogFragment : AppCompatDialogFragment() {
|
||||||
|
override fun onCreateView(
|
||||||
|
inflater: LayoutInflater,
|
||||||
|
container: ViewGroup?,
|
||||||
|
savedInstanceState: Bundle?
|
||||||
|
): View? = inflater.inflate(R.layout.fragment_search_dialog, container, false)
|
||||||
|
}
|
|
@ -6,7 +6,10 @@ package org.mozilla.fenix.settings
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.preference.PreferenceFragmentCompat
|
import androidx.preference.PreferenceFragmentCompat
|
||||||
|
import androidx.preference.SwitchPreference
|
||||||
|
import org.mozilla.fenix.FeatureFlags
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
|
import org.mozilla.fenix.ext.settings
|
||||||
import org.mozilla.fenix.ext.showToolbar
|
import org.mozilla.fenix.ext.showToolbar
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -21,5 +24,11 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
|
||||||
|
|
||||||
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
||||||
setPreferencesFromResource(R.xml.secret_settings_preferences, rootKey)
|
setPreferencesFromResource(R.xml.secret_settings_preferences, rootKey)
|
||||||
|
|
||||||
|
requirePreference<SwitchPreference>(R.string.pref_key_use_new_search_experience).apply {
|
||||||
|
isVisible = FeatureFlags.newSearchExperience
|
||||||
|
isChecked = context.settings().useNewSearchExperience
|
||||||
|
onPreferenceChangeListener = SharedPreferenceUpdater()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
package org.mozilla.fenix.utils
|
||||||
|
|
||||||
|
import mozilla.components.support.ktx.android.content.PreferencesHolder
|
||||||
|
import kotlin.properties.ReadWriteProperty
|
||||||
|
import kotlin.reflect.KProperty
|
||||||
|
|
||||||
|
fun featureFlagPreference(key: String, default: Boolean, featureFlag: Boolean): ReadWriteProperty<PreferencesHolder, Boolean> =
|
||||||
|
FeatureFlagPreferencePreference(key, default, featureFlag)
|
||||||
|
|
||||||
|
private class FeatureFlagPreferencePreference(
|
||||||
|
private val key: String,
|
||||||
|
private val default: Boolean,
|
||||||
|
private val featureFlag: Boolean
|
||||||
|
) : ReadWriteProperty<PreferencesHolder, Boolean> {
|
||||||
|
|
||||||
|
override fun getValue(thisRef: PreferencesHolder, property: KProperty<*>): Boolean =
|
||||||
|
featureFlag && thisRef.preferences.getBoolean(key, default)
|
||||||
|
|
||||||
|
override fun setValue(thisRef: PreferencesHolder, property: KProperty<*>, value: Boolean) =
|
||||||
|
thisRef.preferences.edit().putBoolean(key, value).apply()
|
||||||
|
}
|
|
@ -26,6 +26,7 @@ import mozilla.components.support.ktx.android.content.longPreference
|
||||||
import mozilla.components.support.ktx.android.content.stringPreference
|
import mozilla.components.support.ktx.android.content.stringPreference
|
||||||
import org.mozilla.fenix.BuildConfig
|
import org.mozilla.fenix.BuildConfig
|
||||||
import org.mozilla.fenix.Config
|
import org.mozilla.fenix.Config
|
||||||
|
import org.mozilla.fenix.FeatureFlags
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
import org.mozilla.fenix.browser.browsingmode.BrowsingMode
|
import org.mozilla.fenix.browser.browsingmode.BrowsingMode
|
||||||
import org.mozilla.fenix.components.metrics.MozillaProductDetector
|
import org.mozilla.fenix.components.metrics.MozillaProductDetector
|
||||||
|
@ -96,6 +97,12 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
||||||
override val preferences: SharedPreferences =
|
override val preferences: SharedPreferences =
|
||||||
appContext.getSharedPreferences(FENIX_PREFERENCES, MODE_PRIVATE)
|
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 forceEnableZoom by booleanPreference(
|
var forceEnableZoom by booleanPreference(
|
||||||
appContext.getPreferenceKey(R.string.pref_key_accessibility_force_enable_zoom),
|
appContext.getPreferenceKey(R.string.pref_key_accessibility_force_enable_zoom),
|
||||||
default = false
|
default = false
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
android:text="Hello World"
|
||||||
|
/>
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -27,6 +27,10 @@
|
||||||
android:id="@+id/action_global_search"
|
android:id="@+id/action_global_search"
|
||||||
app:destination="@id/searchFragment" />
|
app:destination="@id/searchFragment" />
|
||||||
|
|
||||||
|
<action
|
||||||
|
android:id="@+id/action_global_search_dialog"
|
||||||
|
app:destination="@id/searchDialogFragment" />
|
||||||
|
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_shareFragment"
|
android:id="@+id/action_global_shareFragment"
|
||||||
app:destination="@id/shareFragment" />
|
app:destination="@id/shareFragment" />
|
||||||
|
@ -137,6 +141,11 @@
|
||||||
app:nullable="true" />
|
app:nullable="true" />
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|
||||||
|
<dialog
|
||||||
|
android:id="@+id/searchDialogFragment"
|
||||||
|
android:name="org.mozilla.fenix.searchdialog.SearchDialogFragment"
|
||||||
|
tools:layout="@layout/fragment_search_dialog" />
|
||||||
|
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/searchFragment"
|
android:id="@+id/searchFragment"
|
||||||
android:name="org.mozilla.fenix.search.SearchFragment"
|
android:name="org.mozilla.fenix.search.SearchFragment"
|
||||||
|
|
|
@ -173,7 +173,7 @@
|
||||||
<string name="pref_key_migrating_from_firefox_nightly_tip" translatable="false">pref_key_migrating_from_firefox_nightly_tip</string>
|
<string name="pref_key_migrating_from_firefox_nightly_tip" translatable="false">pref_key_migrating_from_firefox_nightly_tip</string>
|
||||||
<string name="pref_key_migrating_from_fenix_tip" translatable="false">pref_key_migrating_from_fenix_tip</string>
|
<string name="pref_key_migrating_from_fenix_tip" translatable="false">pref_key_migrating_from_fenix_tip</string>
|
||||||
|
|
||||||
<string name="pref_key_enable_new_tab_tray" translatable="false">pref_key_new_tab_tray</string>
|
<string name="pref_key_use_new_search_experience" translatable="false">pref_key_use_new_search_experience</string>
|
||||||
|
|
||||||
<string name="pref_key_debug_settings" translatable="false">pref_key_debug_settings</string>
|
<string name="pref_key_debug_settings" translatable="false">pref_key_debug_settings</string>
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,8 @@
|
||||||
|
|
||||||
<!-- Label for the secret settings preference -->
|
<!-- Label for the secret settings preference -->
|
||||||
<string name="preferences_debug_settings">Secret Settings</string>
|
<string name="preferences_debug_settings">Secret Settings</string>
|
||||||
<string name="preferences_debug_settings_enable_tab_tray">Use New Tab Tray</string>
|
<!-- Label for the new search experience preference -->
|
||||||
|
<string name="preferences_debug_settings_use_new_search_experience">Use New Search Experience</string>
|
||||||
|
|
||||||
<!-- Content description (not visible, for screen readers etc.) used to announce [LinkTextView]. -->
|
<!-- Content description (not visible, for screen readers etc.) used to announce [LinkTextView]. -->
|
||||||
<string name="link_text_view_type_announcement" translatable="false">link</string>
|
<string name="link_text_view_type_announcement" translatable="false">link</string>
|
||||||
|
|
|
@ -3,4 +3,10 @@
|
||||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"/>
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<SwitchPreference
|
||||||
|
android:defaultValue="false"
|
||||||
|
android:key="@string/pref_key_use_new_search_experience"
|
||||||
|
android:title="@string/preferences_debug_settings_use_new_search_experience"
|
||||||
|
app:iconSpaceReserved="false" />
|
||||||
|
</PreferenceScreen>
|
||||||
|
|
Loading…
Reference in New Issue