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

Merge "Revert "Do not enter pip during transient launch."" into udc-qpr-dev am: bfa03860e1

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

Change-Id: Ica18deed5f14f5cf2fb1b24d33dc8174e5df5b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sam Dubey
2023-07-18 13:48:17 +00:00
committed by Automerger Merge Worker
parent 5cb7302659 bfa03860e1
commit 0eee437cb7
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/wm/Task.java
View File

@@ -5251,18 +5251,17 @@ class Task extends TaskFragment {
// Ensure that we do not trigger entering PiP an activity on the root pinned task. // Ensure that we do not trigger entering PiP an activity on the root pinned task.
return; return;
} }
final boolean isTransient = opts != null && opts.getTransientLaunch();
final Task targetRootTask = toFrontTask != null final Task targetRootTask = toFrontTask != null
? toFrontTask.getRootTask() : toFrontActivity.getRootTask(); ? toFrontTask.getRootTask() : toFrontActivity.getRootTask();
final boolean isTransient = opts != null && opts.getTransientLaunch() if (targetRootTask != null && (targetRootTask.isActivityTypeAssistant() || isTransient)) {
|| (targetRootTask != null // Ensure the task/activity being brought forward is not the assistant and is not
&& targetRootTask.mTransitionController.isTransientHide(targetRootTask)); // transient. In the case of transient-launch, we want to wait until the end of the
// transition and only allow switch if the transient launch was committed.
return;
}
pipCandidate.supportsEnterPipOnTaskSwitch = true;
// Ensure the task/activity being brought forward is not the assistant and is not transient
// nor transient hide target. In the case of transient-launch, we want to wait until the end
// of the transition and only allow to enter pip on task switch after the transient launch
// was committed.
pipCandidate.supportsEnterPipOnTaskSwitch = targetRootTask == null
|| !(targetRootTask.isActivityTypeAssistant() || isTransient);
} }
/** /**

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

@@ -1041,10 +1041,6 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
ar.getTaskFragment().startPausing(false /* uiSleeping */, ar.getTaskFragment().startPausing(false /* uiSleeping */,
null /* resuming */, "finishTransition"); null /* resuming */, "finishTransition");
} finally { } finally {
// Didn't schedule for pip, clear the supportsEnterPipOnTaskSwitch flag.
if (!ar.mPauseSchedulePendingForPip) {
ar.supportsEnterPipOnTaskSwitch = false;
}
mController.mAtm.mTaskSupervisor.mUserLeaving = false; mController.mAtm.mTaskSupervisor.mUserLeaving = false;
} }
// Return false anyway because there's no guarantee that the app will enter pip. // Return false anyway because there's no guarantee that the app will enter pip.