blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #9703 - Exit full screen on pause if pip not entered

master
ekager 2020-04-13 12:08:02 -07:00 committed by Emily Kager
parent 7c3394ea7c
commit ac3a557ddf
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
View File

@ -135,6 +135,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
// We need this so we don't accidentally remove all external sessions on back press // We need this so we don't accidentally remove all external sessions on back press
private var sessionRemoved = false private var sessionRemoved = false
private var enteredPip = false
private val sharedViewModel: SharedViewModel by activityViewModels() private val sharedViewModel: SharedViewModel by activityViewModels()
@ -574,6 +575,11 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
@CallSuper @CallSuper
final override fun onPause() { final override fun onPause() {
super.onPause() super.onPause()
// If we didn't enter PiP, exit full screen on pause
if (!enteredPip) {
fullScreenFeature.onBackPressed()
}
enteredPip = false
if (findNavController().currentDestination?.id != R.id.searchFragment) { if (findNavController().currentDestination?.id != R.id.searchFragment) {
view?.hideKeyboard() view?.hideKeyboard()
} }
@ -798,6 +804,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
override fun onHomePressed(): Boolean { override fun onHomePressed(): Boolean {
if (pipFeature?.onHomePressed() == true) { if (pipFeature?.onHomePressed() == true) {
enteredPip = true
return true return true
} }
return false return false