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

Commit 0b7a7d6f authored by Charles Chen's avatar Charles Chen
Browse files

Add isEmpty info in SplitInfo 

Currently SplitInfo callback didn't dispatched if the top Activity is
from other process than TaskFragmentOrganizer's.

This CL adds a flag isEmpty in SplitInfo to make users know if there may
be an Activity from other process even if Activity list is empty.

Bug: 202230350
Test: manual - reproducible steps mentioned in bug 202230350
Change-Id: Ie28a4db9fffb2d661592cf43f9316aa0824e4635
parent 9c053702

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

+2 −6
Original line number Original line 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.

                // Skipping containers that do not have any activities to report.

                continue;

                continue;

            }

            }

            ActivityStack primaryContainer =

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

                    new ActivityStack(

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

                            container.getPrimaryContainer().collectActivities());

            ActivityStack secondaryContainer =

                    new ActivityStack(

                            container.getSecondaryContainer().collectActivities());

            SplitInfo splitState = new SplitInfo(primaryContainer,

            SplitInfo splitState = new SplitInfo(primaryContainer,

                    secondaryContainer,

                    secondaryContainer,

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

                    // 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 Original line Diff line number Diff line
@@ -109,6 +109,10 @@ class TaskFragmentContainer { 
        return allActivities;

        return allActivities;

    }

    }





    ActivityStack toActivityStack() {

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

    }



    void addPendingAppearedActivity(@NonNull Activity pendingAppearedActivity) {

    void addPendingAppearedActivity(@NonNull Activity pendingAppearedActivity) {

        mPendingAppearedActivities.add(pendingAppearedActivity);

        mPendingAppearedActivities.add(pendingAppearedActivity);

    }

    }