diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index da2c235cf1..c3b944f2e3 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -29,11 +29,6 @@ object FeatureFlags {
*/
val tabTray = Config.channel.isNightlyOrDebug
- /**
- * Enables gestures on the browser chrome that depend on a [SwipeGestureLayout]
- */
- val browserChromeGestures = Config.channel.isNightlyOrDebug
-
/**
* Enables viewing tab history
*/
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index cfad148597..1acc0e059a 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -168,11 +168,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
require(arguments != null)
customTabSessionId = arguments?.getString(EXTRA_SESSION_ID)
- val view = if (FeatureFlags.browserChromeGestures) {
- inflater.inflate(R.layout.browser_gesture_wrapper, container, false)
- } else {
- inflater.inflate(R.layout.fragment_browser, container, false)
- }
+ val view = inflater.inflate(R.layout.fragment_browser, container, false)
val activity = activity as HomeActivity
activity.themeManager.applyStatusBarTheme(activity)
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 9163d8ab52..797a5c34dc 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -15,7 +15,6 @@ import androidx.core.content.ContextCompat
import androidx.lifecycle.Observer
import androidx.navigation.fragment.findNavController
import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.browser_gesture_wrapper.*
import kotlinx.android.synthetic.main.fragment_browser.*
import kotlinx.android.synthetic.main.fragment_browser.view.*
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -32,7 +31,6 @@ import mozilla.components.feature.tab.collections.TabCollection
import mozilla.components.feature.tabs.WindowFeature
import mozilla.components.support.base.feature.UserInteractionHandler
import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
-import org.mozilla.fenix.FeatureFlags
import org.mozilla.fenix.R
import org.mozilla.fenix.addons.runIfFragmentIsAttached
import org.mozilla.fenix.components.FenixSnackbar
@@ -77,19 +75,15 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
val components = context.components
return super.initializeUI(view)?.also {
- // We need to wrap this whole thing in an if here because gestureLayout will not exist
- // if the feature flag is off
- if (FeatureFlags.browserChromeGestures) {
- gestureLayout.addGestureListener(
- ToolbarGestureHandler(
- activity = requireActivity(),
- contentLayout = browserLayout,
- tabPreview = tabPreview,
- toolbarLayout = browserToolbarView.view,
- sessionManager = components.core.sessionManager
- )
+ gestureLayout.addGestureListener(
+ ToolbarGestureHandler(
+ activity = requireActivity(),
+ contentLayout = browserLayout,
+ tabPreview = tabPreview,
+ toolbarLayout = browserToolbarView.view,
+ sessionManager = components.core.sessionManager
)
- }
+ )
val readerModeAction =
BrowserToolbar.ToggleButton(
diff --git a/app/src/main/res/layout/browser_gesture_wrapper.xml b/app/src/main/res/layout/browser_gesture_wrapper.xml
deleted file mode 100644
index 4de55e61f2..0000000000
--- a/app/src/main/res/layout/browser_gesture_wrapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index 328f9bedd1..5ed490ea6f 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -1,53 +1,66 @@
-
-
-
+ android:layout_height="match_parent">
-
+ tools:context="browser.BrowserFragment">
-
+
+
+
+
+
+
+
+
-
+
-
-
-
+
-
-
-
+