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

Commit e05b7c2c authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Limit launching placeholder to top TaskFragment" into tm-dev am: b4620e28 

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

Change-Id: I24b7ed7edf859352b41ed77c40f0a7a809e4d761
parents fb3423a2 b4620e28

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+5 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    TaskFragmentContainer getTopActiveContainer() {

        for (int i = mContainers.size() - 1; i >= 0; i--) {

            TaskFragmentContainer container = mContainers.get(i);

            if (!container.isFinished() && container.getTopNonFinishingActivity() != null) {

            if (!container.isFinished() && container.getRunningActivityCount() > 0) {

                return container;

            }

        }
@@ -499,6 +499,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
    boolean launchPlaceholderIfNecessary(@NonNull Activity activity) {

        final  TaskFragmentContainer container = getContainerWithActivity(

                activity.getActivityToken());

        // Don't launch placeholder if the container is occluded.

        if (container != getTopActiveContainer()) {

            return false;

        }



        SplitContainer splitContainer = container != null ? getActiveSplitForContainer(container)

                : null;