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

Commit d7a75e5b authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix not tracking splitting tasks correctly" into udc-dev am: 303d6101 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23149642



Change-Id: Ie7f59ef4c30dcb6275735e4d34c6d9f83ecc0876
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6dcf6f0e 303d6101

quickstep/src/com/android/quickstep/TopTaskTracker.java

+4 −15
Original line number Diff line number Diff line
@@ -127,23 +127,16 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta 


    @Override

    public void onTaskStageChanged(int taskId, @StageType int stage, boolean visible) {

        // If task is not visible but we are tracking it, stop tracking it

        if (!visible) {

        // If a task is not visible anymore or has been moved to undefined, stop tracking it.

        if (!visible || stage == SplitConfigurationOptions.STAGE_TYPE_UNDEFINED) {

            if (mMainStagePosition.taskId == taskId) {

                resetTaskId(mMainStagePosition);

                mMainStagePosition.taskId = INVALID_TASK_ID;

            } else if (mSideStagePosition.taskId == taskId) {

                resetTaskId(mSideStagePosition);

                mSideStagePosition.taskId = INVALID_TASK_ID;

            } // else it's an un-tracked child

            return;

        }



        // If stage has moved to undefined, stop tracking the task

        if (stage == SplitConfigurationOptions.STAGE_TYPE_UNDEFINED) {

            resetTaskId(taskId == mMainStagePosition.taskId

                    ? mMainStagePosition : mSideStagePosition);

            return;

        }



        if (stage == SplitConfigurationOptions.STAGE_TYPE_MAIN) {

            mMainStagePosition.taskId = taskId;

        } else {
@@ -161,10 +154,6 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta 
        mPinnedTaskId = INVALID_TASK_ID;

    }



    private void resetTaskId(SplitStageInfo taskPosition) {

        taskPosition.taskId = -1;

    }



    /**

     * @return index 0 will be task in left/top position, index 1 in right/bottom position.

     *         Will return empty array if device is not in staged split