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

Commit 958c4df8 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Update correct split task Id to RecentsTaskController..." into udc-dev am: d4464ea9 

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



Change-Id: Id6ee2efee677ec8144e5eeb23c1876c152c4df96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73cdca01 d4464ea9

core/java/android/app/TaskInfo.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -333,6 +333,12 @@ public class TaskInfo { 
     */

     */

    public boolean isVisible;

    public boolean isVisible;





    /**

     * Whether this task is request visible.

     * @hide

     */

    public boolean isVisibleRequested;



    /**

    /**

     * Whether this task is sleeping due to sleeping display.

     * Whether this task is sleeping due to sleeping display.

     * @hide

     * @hide
@@ -518,6 +524,7 @@ public class TaskInfo { 
                && Objects.equals(taskDescription, that.taskDescription)

                && Objects.equals(taskDescription, that.taskDescription)

                && isFocused == that.isFocused

                && isFocused == that.isFocused

                && isVisible == that.isVisible

                && isVisible == that.isVisible

                && isVisibleRequested == that.isVisibleRequested

                && isSleeping == that.isSleeping

                && isSleeping == that.isSleeping

                && Objects.equals(mTopActivityLocusId, that.mTopActivityLocusId)

                && Objects.equals(mTopActivityLocusId, that.mTopActivityLocusId)

                && parentTaskId == that.parentTaskId

                && parentTaskId == that.parentTaskId
@@ -591,6 +598,7 @@ public class TaskInfo { 
        parentTaskId = source.readInt();

        parentTaskId = source.readInt();

        isFocused = source.readBoolean();

        isFocused = source.readBoolean();

        isVisible = source.readBoolean();

        isVisible = source.readBoolean();

        isVisibleRequested = source.readBoolean();

        isSleeping = source.readBoolean();

        isSleeping = source.readBoolean();

        topActivityInSizeCompat = source.readBoolean();

        topActivityInSizeCompat = source.readBoolean();

        topActivityEligibleForLetterboxEducation = source.readBoolean();

        topActivityEligibleForLetterboxEducation = source.readBoolean();
@@ -644,6 +652,7 @@ public class TaskInfo { 
        dest.writeInt(parentTaskId);

        dest.writeInt(parentTaskId);

        dest.writeBoolean(isFocused);

        dest.writeBoolean(isFocused);

        dest.writeBoolean(isVisible);

        dest.writeBoolean(isVisible);

        dest.writeBoolean(isVisibleRequested);

        dest.writeBoolean(isSleeping);

        dest.writeBoolean(isSleeping);

        dest.writeBoolean(topActivityInSizeCompat);

        dest.writeBoolean(topActivityInSizeCompat);

        dest.writeBoolean(topActivityEligibleForLetterboxEducation);

        dest.writeBoolean(topActivityEligibleForLetterboxEducation);
@@ -687,6 +696,7 @@ public class TaskInfo { 
                + " parentTaskId=" + parentTaskId

                + " parentTaskId=" + parentTaskId

                + " isFocused=" + isFocused

                + " isFocused=" + isFocused

                + " isVisible=" + isVisible

                + " isVisible=" + isVisible

                + " isVisibleRequested=" + isVisibleRequested

                + " isSleeping=" + isSleeping

                + " isSleeping=" + isSleeping

                + " topActivityInSizeCompat=" + topActivityInSizeCompat

                + " topActivityInSizeCompat=" + topActivityInSizeCompat

                + " topActivityEligibleForLetterboxEducation= "

                + " topActivityEligibleForLetterboxEducation= "

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1636,7 +1636,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            mLogger.logSideStageAppChange(getSideStagePosition(), mSideStage.getTopChildTaskUid(),

            mLogger.logSideStageAppChange(getSideStagePosition(), mSideStage.getTopChildTaskUid(),

                    mSplitLayout.isLandscape());

                    mSplitLayout.isLandscape());

        }

        }

        if (present && visible) {

        if (present) {

            updateRecentTasksSplitPair();

            updateRecentTasksSplitPair();

        }

        }

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -127,7 +127,8 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
     * Returns the top visible child task's id.

     * Returns the top visible child task's id.

     */

     */

    int getTopVisibleChildTaskId() {

    int getTopVisibleChildTaskId() {

        final ActivityManager.RunningTaskInfo taskInfo = getChildTaskInfo(t -> t.isVisible);

        final ActivityManager.RunningTaskInfo taskInfo = getChildTaskInfo(t -> t.isVisible

                && t.isVisibleRequested);

        return taskInfo != null ? taskInfo.taskId : INVALID_TASK_ID;

        return taskInfo != null ? taskInfo.taskId : INVALID_TASK_ID;

    }

    }
@@ -183,7 +184,8 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
            final int taskId = taskInfo.taskId;

            final int taskId = taskInfo.taskId;

            mChildrenLeashes.put(taskId, leash);

            mChildrenLeashes.put(taskId, leash);

            mChildrenTaskInfo.put(taskId, taskInfo);

            mChildrenTaskInfo.put(taskId, taskInfo);

            mCallbacks.onChildTaskStatusChanged(taskId, true /* present */, taskInfo.isVisible);

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

                    taskInfo.isVisible && taskInfo.isVisibleRequested);

            if (ENABLE_SHELL_TRANSITIONS) {

            if (ENABLE_SHELL_TRANSITIONS) {

                // Status is managed/synchronized by the transition lifecycle.

                // Status is managed/synchronized by the transition lifecycle.

                return;

                return;
@@ -223,7 +225,7 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
            }

            }

            mChildrenTaskInfo.put(taskInfo.taskId, taskInfo);

            mChildrenTaskInfo.put(taskInfo.taskId, taskInfo);

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

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

                    taskInfo.isVisible);

                    taskInfo.isVisible && taskInfo.isVisibleRequested);

            if (!ENABLE_SHELL_TRANSITIONS) {

            if (!ENABLE_SHELL_TRANSITIONS) {

                updateChildTaskSurface(

                updateChildTaskSurface(

                        taskInfo, mChildrenLeashes.get(taskInfo.taskId), false /* firstAppeared */);

                        taskInfo, mChildrenLeashes.get(taskInfo.taskId), false /* firstAppeared */);

services/core/java/com/android/server/wm/Task.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -3443,6 +3443,7 @@ class Task extends TaskFragment { 
                : INVALID_TASK_ID;

                : INVALID_TASK_ID;

        info.isFocused = isFocused();

        info.isFocused = isFocused();

        info.isVisible = hasVisibleChildren();

        info.isVisible = hasVisibleChildren();

        info.isVisibleRequested = isVisibleRequested();

        info.isSleeping = shouldSleepActivities();

        info.isSleeping = shouldSleepActivities();

        info.isLetterboxDoubleTapEnabled = top != null

        info.isLetterboxDoubleTapEnabled = top != null

                && top.mLetterboxUiController.isLetterboxDoubleTapEducationEnabled();

                && top.mLetterboxUiController.isLetterboxDoubleTapEducationEnabled();