From e1653f629ed5eed2482f383a0b79e4e9e908147f Mon Sep 17 00:00:00 2001 From: Kainalu Hagiwara Date: Thu, 30 Jul 2020 11:24:14 -0700 Subject: [PATCH] For #13127 - Make sure tabPreview is added after browserLayout. --- .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 4 +--- app/src/main/res/layout/browser_gesture_wrapper.xml | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) 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 54f0ccb2d..d16f956e9 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -167,9 +167,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session customTabSessionId = arguments?.getString(EXTRA_SESSION_ID) val view = if (FeatureFlags.browserChromeGestures) { - inflater.inflate(R.layout.browser_gesture_wrapper, container, false).apply { - inflater.inflate(R.layout.fragment_browser, this as SwipeGestureLayout, true) - } + inflater.inflate(R.layout.browser_gesture_wrapper, container, false) } else { inflater.inflate(R.layout.fragment_browser, container, false) } diff --git a/app/src/main/res/layout/browser_gesture_wrapper.xml b/app/src/main/res/layout/browser_gesture_wrapper.xml index 94f515687..4de55e61f 100644 --- a/app/src/main/res/layout/browser_gesture_wrapper.xml +++ b/app/src/main/res/layout/browser_gesture_wrapper.xml @@ -7,6 +7,8 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + +