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

Commit 4208679c authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix side stage cannot be focused" into sc-v2-dev am: 28643db5 

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

Change-Id: Id178fa35d313ebd8799020336af4619f25601211
parents cdcd6301 28643db5

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