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

Commit 8485a917 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't dismiss split during enter if already visible" into udc-dev am:... 

Merge "Don't dismiss split during enter if already visible" into udc-dev am: 1f23db54 am: 0a3a98a1 am: eeb107e0

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



Change-Id: Ie60b0ac31f546db62d626b9217cd6d7512700da3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a1e71c9 eeb107e0

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

+7 −3
Original line number Diff line number Diff line
@@ -1516,6 +1516,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            // Legacy transition we need to create divider here, shell transition case we will

            // create it on #finishEnterSplitScreen

            mSplitLayout.init();

        } else {

            // We handle split visibility itself on shell transition, but sometimes we didn't

            // reset it correctly after dismiss by some reason, so just set invisible before active.

            setSplitsVisible(false);

        }

        if (taskInfo != null) {

            setSideStagePosition(startPosition, wct);
@@ -2654,11 +2658,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 


        if (mSplitTransitions.mPendingEnter.mExtraTransitType

                == TRANSIT_SPLIT_SCREEN_OPEN_TO_SIDE) {

            // Open to side should only be used when split already active and foregorund.

            if (mainChild == null && sideChild == null) {

                Log.w(TAG, "Launched a task in split, but didn't receive any task in transition.");

                mSplitTransitions.mPendingEnter.cancel((cancelWct, cancelT)

                        -> prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, cancelWct));

                mSplitUnsupportedToast.show();

                // This should happen when the target app is already on front, so just cancel.

                mSplitTransitions.mPendingEnter.cancel(null);

                return true;

            }

        } else {