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

Commit 2003f579 authored by Tony Huang's avatar Tony Huang
Browse files

Fix side stage cannot be focused 

When split active by drag drop, the active point is
onStageHasChildrenChanged callback but we don't reorder side stage
to top then make it cannot be focused.

Add reorder root to top for fixing.

Fix: 204510713
Test: manual
Test: pass existing tests
Change-Id: I553a57250c302ff435a35c9a10599fc375e48248
parent 44850438

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

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ class SideStage extends StageTaskListener { 
                stageTaskUnfoldController);

    }



    void moveToTop(Rect rootBounds, WindowContainerTransaction wct) {

        final WindowContainerToken rootToken = mRootTaskInfo.token;

        wct.setBounds(rootToken, rootBounds).reorder(rootToken, true /* onTop */);

    }



    void addTask(ActivityManager.RunningTaskInfo task, Rect rootBounds,

            WindowContainerTransaction wct) {

        final WindowContainerToken rootToken = mRootTaskInfo.token;

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

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            final WindowContainerTransaction wct = new WindowContainerTransaction();

            // Make sure the main stage is active.

            mMainStage.activate(getMainStageBounds(), wct, true /* reparent */);

            mSideStage.setBounds(getSideStageBounds(), wct);

            mSideStage.moveToTop(getSideStageBounds(), wct);

            mTaskOrganizer.applyTransaction(wct);

        }

        if (!mLogger.hasStartedSession() && mMainStageListener.mHasChildren