From 686facffc6ca21c1c38765306507f2269f5314b5 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Thu, 12 Dec 2019 13:27:16 -0800
Subject: [PATCH] For #6946 - Get engine margins without assuming top/bottom
 toolbar

---
 .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 8 +++++++-
 .../java/org/mozilla/fenix/browser/BrowserFragment.kt     | 5 -----
 .../fenix/customtabs/ExternalAppBrowserFragment.kt        | 8 ++------
 3 files changed, 9 insertions(+), 12 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 1f994ad5e..a681a3517 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -593,7 +593,13 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
     /**
      * Returns the top and bottom margins.
      */
-    protected abstract fun getEngineMargins(): Pair<Int, Int>
+    private fun getEngineMargins(): Pair<Int, Int> =
+        if (context?.settings()?.shouldUseBottomToolbar == true) {
+            val toolbarSize = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
+            0 to toolbarSize
+        } else {
+            0 to 0
+        }
 
     /**
      * Returns the layout [android.view.Gravity] for the quick settings and ETP dialog.
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 a5a896258..c408bd14d 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -190,11 +190,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
         }
     }
 
-    override fun getEngineMargins(): Pair<Int, Int> {
-        val toolbarSize = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
-        return 0 to toolbarSize
-    }
-
     private fun themeReaderViewControlsForPrivateMode(view: View) = with(view) {
         listOf(
             R.id.mozac_feature_readerview_font_size_decrease,
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
index e14c17fa6..3a3c848fd 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
@@ -71,7 +71,8 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler
                         isPrivate = (activity as HomeActivity).browsingModeManager.mode.isPrivate
                     ),
                     owner = this,
-                    view = view)
+                    view = view
+                )
 
                 windowFeature.set(
                     feature = CustomTabWindowFeature(
@@ -186,11 +187,6 @@ class ExternalAppBrowserFragment : BaseBrowserFragment(), UserInteractionHandler
         }
     }
 
-    override fun getEngineMargins(): Pair<Int, Int> {
-        // Since the top toolbar is dynamic we don't want any margins
-        return 0 to 0
-    }
-
     override fun getContextMenuCandidates(
         context: Context,
         view: View