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

Commit df8f2448 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 am: 4208679c 

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

Change-Id: I4e857790e17e264ac3717eaf362ca40bcc5df787
parents 2f8ddace 4208679c

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

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

                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,

    void addTask(ActivityManager.RunningTaskInfo task, Rect rootBounds,

            WindowContainerTransaction wct) {

            WindowContainerTransaction wct) {

        final WindowContainerToken rootToken = mRootTaskInfo.token;

        final WindowContainerToken rootToken = mRootTaskInfo.token;

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

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

            final WindowContainerTransaction wct = new WindowContainerTransaction();

            // Make sure the main stage is active.

            // Make sure the main stage is active.

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

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

            mSideStage.setBounds(getSideStageBounds(), wct);

            mSideStage.moveToTop(getSideStageBounds(), wct);

            mTaskOrganizer.applyTransaction(wct);

            mTaskOrganizer.applyTransaction(wct);

        }

        }

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

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