Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

For #18727: Exit PiP when launched externally with Intents #20486

Closed
wants to merge 4 commits into from
Closed

For #18727: Exit PiP when launched externally with Intents #20486

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75acc52
For #18727: Exit PiP when launched externally with Intents
czlucius Aug 31, 2021
64ef0ec
Merge branch 'main' into fix-issue-18727
mergify[bot] Sep 1, 2021
7c7c1c8
Merge branch 'main' into fix-issue-18727
mergify[bot] Sep 1, 2021
5093d5e
Merge branch 'main' into fix-issue-18727
mergify[bot] Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package org.mozilla.fenix
import android.content.Context
import android.content.Intent
import android.content.Intent.ACTION_MAIN
import android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
import android.content.res.Configuration
import android.os.Build
import android.os.Bundle
Expand Down Expand Up @@ -188,6 +189,9 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
super.onCreate(savedInstanceState)
}

// Checks if Activity is currently in PiP mode if launched from external intents, then exits it
checkAndExitPiP()

// Diagnostic breadcrumb for "Display already aquired" crash:
// https://github.com/mozilla-mobile/android-components/issues/7960
breadcrumb(
Expand Down Expand Up @@ -266,6 +270,14 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
StartupTimeline.onActivityCreateEndHome(this) // DO NOT MOVE ANYTHING BELOW HERE.
}

private fun checkAndExitPiP() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInPictureInPictureMode && intent != null) {
// Exit PiP mode
moveTaskToBack(false)
startActivity(Intent(this, this::class.java).setFlags(FLAG_ACTIVITY_REORDER_TO_FRONT))
}
}

private fun startupTelemetryOnCreateCalled(safeIntent: SafeIntent) {
// We intentionally only record this in HomeActivity and not ExternalBrowserActivity (e.g.
// PWAs) so we don't include more unpredictable code paths in the results.
Expand Down