diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt index 52c61262cc..74face5407 100644 --- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt +++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt @@ -43,11 +43,6 @@ object FeatureFlags { */ const val inactiveTabs = true - /** - * Enables showing the home screen behind the search dialog - */ - const val showHomeBehindSearch = true - /** * Identifies and separates the tabs list with a group containing search term tabs. */ 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 68275909eb..40499ef261 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 @@ -15,7 +15,6 @@ import mozilla.components.concept.engine.EngineView import mozilla.components.feature.tabs.TabsUseCases import mozilla.components.support.ktx.kotlin.isUrl import mozilla.components.ui.tabcounter.TabCounterMenu -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.BrowserAnimator @@ -98,7 +97,7 @@ class DefaultBrowserToolbarController( // covered up with the search results). So, skip the navigation event in that case. // If we don't, there's a visual flickr as we navigate to Home and then display search // results on top it. - if (FeatureFlags.showHomeBehindSearch && currentSession?.content?.searchTerms.isNullOrBlank()) { + if (currentSession?.content?.searchTerms.isNullOrBlank()) { browserAnimator.captureEngineViewAndDrawStatically { navController.navigate( BrowserFragmentDirections.actionGlobalHome() diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index 2ed7e17935..d44fa714c3 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -59,7 +59,6 @@ import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged import mozilla.components.ui.autocomplete.InlineAutocompleteEditText import org.mozilla.fenix.BrowserDirection -import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.components.metrics.Event @@ -96,19 +95,13 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { override fun onStart() { super.onStart() - if (FeatureFlags.showHomeBehindSearch) { - // This will need to be handled for the update to R. We need to resize here in order to - // see the whole homescreen behind the search dialog. - @Suppress("DEPRECATION") - requireActivity().window.setSoftInputMode( - WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE - ) - } else { - // https://github.com/mozilla-mobile/fenix/issues/14279 - // To prevent GeckoView from resizing we're going to change the softInputMode to not adjust - // the size of the window. - requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING) - } + // This will need to be handled for the update to R. We need to resize here in order to + // see the whole homescreen behind the search dialog. + @Suppress("DEPRECATION") + requireActivity().window.setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + ) + // Refocus the toolbar editing and show keyboard if the QR fragment isn't showing if (childFragmentManager.findFragmentByTag(QR_FRAGMENT_TAG) == null) { toolbarView.view.edit.focus() @@ -495,7 +488,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { // In case we're displaying search results, we wouldn't have navigated to home, and // so we don't need to navigate "back to" browser fragment. // See mirror of this logic in BrowserToolbarController#handleToolbarClick. - if (FeatureFlags.showHomeBehindSearch && store.state.searchTerms.isBlank()) { + if (store.state.searchTerms.isBlank()) { val args by navArgs() args.sessionId?.let { findNavController().navigate(