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

Commit 53367017 authored by Winson Chung's avatar Winson Chung
Browse files

Revert "SplitScrn: Check for all children visibility when updating mVisible." 

This reverts commit e984551f.

Flag: EXEMPT revert
Bug: 383444878
Test: atest WMShellUnitTests
Change-Id: I634dbd58e8f40425c8b648e2aef34a2dca9c85bd
parent 5982319f

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

+2 −15
Original line number Diff line number Diff line
@@ -260,9 +260,9 @@ public class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
                return;

            }

            mChildrenTaskInfo.put(taskInfo.taskId, taskInfo);

            mVisible = isStageVisible();

            mVisible = taskInfo.isVisible && taskInfo.isVisibleRequested;

            mCallbacks.onChildTaskStatusChanged(this, taskInfo.taskId, true /* present */,

                    taskInfo.isVisible && taskInfo.isVisibleRequested);

                    mVisible);

        } else {

            throw new IllegalArgumentException(this + "\n Unknown task: " + taskInfo

                    + "\n mRootTaskInfo: " + mRootTaskInfo);
@@ -309,19 +309,6 @@ public class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
        t.reparent(sc, findTaskSurface(taskId));

    }



    /**

     * Checks against all children task info and return true if any are marked as visible.

     */

    private boolean isStageVisible() {

        for (int i = mChildrenTaskInfo.size() - 1; i >= 0; --i) {

            if (mChildrenTaskInfo.valueAt(i).isVisible

                    && mChildrenTaskInfo.valueAt(i).isVisibleRequested) {

                return true;

            }

        }

        return false;

    }



    private SurfaceControl findTaskSurface(int taskId) {

        if (mRootTaskInfo.taskId == taskId) {

            return mRootLeash;