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

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

Merge "Add isEmpty info in SplitInfo" into sc-v2-dev am: e88d0b2e 

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

Change-Id: I1ad2fca646fdde01a4dcf00ce99414639b2c849e
parents 7aa0266e e88d0b2e

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

+2 −6
Original line number Diff line number Diff line
@@ -516,12 +516,8 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
                // Skipping containers that do not have any activities to report.

                continue;

            }

            ActivityStack primaryContainer =

                    new ActivityStack(

                            container.getPrimaryContainer().collectActivities());

            ActivityStack secondaryContainer =

                    new ActivityStack(

                            container.getSecondaryContainer().collectActivities());

            ActivityStack primaryContainer = container.getPrimaryContainer().toActivityStack();

            ActivityStack secondaryContainer = container.getSecondaryContainer().toActivityStack();

            SplitInfo splitState = new SplitInfo(primaryContainer,

                    secondaryContainer,

                    // Splits that are not showing side-by-side are reported as having 0 split

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

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ class TaskFragmentContainer { 
        return allActivities;

    }



    ActivityStack toActivityStack() {

        return new ActivityStack(collectActivities(), mInfo.getRunningActivityCount() == 0);

    }



    void addPendingAppearedActivity(@NonNull Activity pendingAppearedActivity) {

        mPendingAppearedActivities.add(pendingAppearedActivity);

    }