From d81aa62683f6518238b7fe34303032194274919f Mon Sep 17 00:00:00 2001 From: Tiger Oakes Date: Mon, 15 Jun 2020 09:33:06 -0700 Subject: [PATCH] Fix PIP toolbar --- .../org/mozilla/fenix/browser/BaseBrowserFragment.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 4dd9bf48f..4f7b1ebbb 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -706,11 +706,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session @CallSuper final override fun onPause() { super.onPause() - val session = requireComponents.core.store.state.findTabOrCustomTabOrSelectedTab(customTabSessionId) - // If we didn't enter PiP, exit full screen on pause - if (session?.content?.pictureInPictureEnabled == false && fullScreenFeature.onBackPressed()) { - fullScreenChanged(false) - } if (findNavController().currentDestination?.id != R.id.searchFragment) { view?.hideKeyboard() } @@ -720,6 +715,13 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session override fun onStop() { super.onStop() initUIJob?.cancel() + + requireComponents.core.store.state.findTabOrCustomTabOrSelectedTab(customTabSessionId)?.let { session -> + // If we didn't enter PiP, exit full screen on stop + if (!session.content.pictureInPictureEnabled && fullScreenFeature.onBackPressed()) { + fullScreenChanged(false) + } + } } @CallSuper