Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Also check PiP activity visibility to determine if enter-pip" into udc-dev am: cc054b9433

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23754867

Change-Id: I60da128b21fa4b96c35bb9ca543a6b4392401fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2023-06-22 00:14:24 +00:00
committed by Automerger Merge Worker
parent 452a189cd6 cc054b9433
commit 2da5453996
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/Transition.java
View File

@@ -979,7 +979,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
}
if (ar.pictureInPictureArgs != null && ar.pictureInPictureArgs.isAutoEnterEnabled()) {
if (didCommitTransientLaunch()) {
if (!ar.getTask().isVisibleRequested() || didCommitTransientLaunch()) {
// force enable pip-on-task-switch now that we've committed to actually launching
// to the transient activity.
ar.supportsEnterPipOnTaskSwitch = true;
@@ -1008,7 +1008,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
}
// Legacy pip-entry (not via isAutoEnterEnabled).
if (didCommitTransientLaunch() && ar.supportsPictureInPicture()) {
if ((!ar.getTask().isVisibleRequested() || didCommitTransientLaunch())
&& ar.supportsPictureInPicture()) {
// force enable pip-on-task-switch now that we've committed to actually launching to the
// transient activity, and then recalculate whether we can attempt pip.
ar.supportsEnterPipOnTaskSwitch = true;