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

Browse Source
This commit is contained in:
Evan Rosky
2023-06-21 23:49:39 +00:00
committed by Android (Google) Code Review
parent 65be4cf187 34cf703bdb
commit cc054b9433
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 (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 // force enable pip-on-task-switch now that we've committed to actually launching
// to the transient activity. // to the transient activity.
ar.supportsEnterPipOnTaskSwitch = true; ar.supportsEnterPipOnTaskSwitch = true;
@@ -1008,7 +1008,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
} }
// Legacy pip-entry (not via isAutoEnterEnabled). // 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 // 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. // transient activity, and then recalculate whether we can attempt pip.
ar.supportsEnterPipOnTaskSwitch = true; ar.supportsEnterPipOnTaskSwitch = true;