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

Merge "Exclude transient activity from hide-tasks" into udc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2023-03-17 04:36:40 +00:00
committed by Android (Google) Code Review
parent ccd8a87ab0 0cc3386d9f
commit 316bb2566e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,13 +278,14 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
setTransientLaunchToChanges(activity); setTransientLaunchToChanges(activity);
if (restoreBelow != null) { if (restoreBelow != null) {
final Task transientRootTask = activity.getRootTask();
// Collect all visible activities which can be occluded by the transient activity to // Collect all visible activities which can be occluded by the transient activity to
// make sure they are in the participants so their visibilities can be updated when // make sure they are in the participants so their visibilities can be updated when
// finishing transition. // finishing transition.
((WindowContainer<?>) restoreBelow.getParent()).forAllTasks(t -> { ((WindowContainer<?>) restoreBelow.getParent()).forAllTasks(t -> {
if (t.isVisibleRequested() && !t.isAlwaysOnTop() if (t.isVisibleRequested() && !t.isAlwaysOnTop()
&& !t.getWindowConfiguration().tasksAreFloating()) { && !t.getWindowConfiguration().tasksAreFloating()) {
if (t.isRootTask()) { if (t.isRootTask() && t != transientRootTask) {
mTransientHideTasks.add(t); mTransientHideTasks.add(t);
} }
if (t.isLeafTask()) { if (t.isLeafTask()) {