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

Merge "Completely remove pinned task when starting a new PiP" into tm-dev am: bfbf74aec1 am: 420f7e1dae am: 0d6a4a136b

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

Change-Id: I5504fe6a0f7a6b687d6806fccf9b6f9af12e9411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2022-05-11 03:42:07 +00:00
committed by Automerger Merge Worker
parent 000dacbf3c 0d6a4a136b
commit 209188fcaa
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2004,7 +2004,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
final Task rootPinnedTask = taskDisplayArea.getRootPinnedTask(); final Task rootPinnedTask = taskDisplayArea.getRootPinnedTask();
if (rootPinnedTask != null) { if (rootPinnedTask != null) {
transitionController.collect(rootPinnedTask); transitionController.collect(rootPinnedTask);
rootPinnedTask.dismissPip(); // The new ActivityRecord should replace the existing PiP, so it's more desirable
// that the old PiP disappears instead of turning to full-screen at the same time,
// as the Task#dismissPip is trying to do.
removeRootTasksInWindowingModes(WINDOWING_MODE_PINNED);
} }
// Set a transition to ensure that we don't immediately try and update the visibility // Set a transition to ensure that we don't immediately try and update the visibility