Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5114e73 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Exclude transient activity from hide-tasks" into udc-dev am: 316bb256 am: 911f34c9 

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



Change-Id: I88c92d248bae31a84deee1c751e9170e8ae68dbb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0179d347 911f34c9

services/core/java/com/android/server/wm/Transition.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -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()) {