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

Commit f926b206 authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Only need to dismiss stage if one of the task is closed." into udc-dev... 

Merge "Only need to dismiss stage if one of the task is closed." into udc-dev am: 54d018e1 am: 43084e1b

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



Change-Id: I7cdb1e3ca41c835655af7999830b8b8155f82515
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5bb9a348 43084e1b

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -2419,12 +2419,13 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    }

                    }

                }

                }

            }

            }

            // If the size of dismissStages > 0, the task is closed without prepare pending

            // If the size of dismissStages == 1, one of the task is closed without prepare pending

            // transition, which could happen if all activities were finished after finish top

            // transition, which could happen if all activities were finished after finish top

            // activity in a task, so the trigger task is null when handleRequest.

            // activity in a task, so the trigger task is null when handleRequest.

            // Note if the size of dismissStages == 2, it's starting a new task, so don't handle it.

            final ArraySet<StageTaskListener> dismissStages = record.getShouldDismissedStage();

            final ArraySet<StageTaskListener> dismissStages = record.getShouldDismissedStage();

            if (mMainStage.getChildCount() == 0 || mSideStage.getChildCount() == 0

            if (mMainStage.getChildCount() == 0 || mSideStage.getChildCount() == 0

                    || dismissStages.size() > 0) {

                    || dismissStages.size() == 1) {

                Log.e(TAG, "Somehow removed the last task in a stage outside of a proper "

                Log.e(TAG, "Somehow removed the last task in a stage outside of a proper "

                        + "transition.");

                        + "transition.");

                final WindowContainerTransaction wct = new WindowContainerTransaction();

                final WindowContainerTransaction wct = new WindowContainerTransaction();