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

Commit f2b5c0f4 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: I90bf02b791827890b886ce2adfc7b1a3b44b7012
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5dbf718 d4464ea9

core/java/android/app/TaskInfo.java

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

    public boolean isVisible;



    /**

     * Whether this task is request visible.

     * @hide

     */

    public boolean isVisibleRequested;



    /**

     * Whether this task is sleeping due to sleeping display.

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

                && isFocused == that.isFocused

                && isVisible == that.isVisible

                && isVisibleRequested == that.isVisibleRequested

                && isSleeping == that.isSleeping

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

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

        isFocused = source.readBoolean();

        isVisible = source.readBoolean();

        isVisibleRequested = source.readBoolean();

        isSleeping = source.readBoolean();

        topActivityInSizeCompat = source.readBoolean();

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

        dest.writeBoolean(isFocused);

        dest.writeBoolean(isVisible);

        dest.writeBoolean(isVisibleRequested);

        dest.writeBoolean(isSleeping);

        dest.writeBoolean(topActivityInSizeCompat);

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

                + " isFocused=" + isFocused

                + " isVisible=" + isVisible

                + " isVisibleRequested=" + isVisibleRequested

                + " isSleeping=" + isSleeping

                + " topActivityInSizeCompat=" + topActivityInSizeCompat

                + " topActivityEligibleForLetterboxEducation= "

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

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

                    mSplitLayout.isLandscape());

        }

        if (present && visible) {

        if (present) {

            updateRecentTasksSplitPair();

        }

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

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

     */

    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;

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

            mChildrenLeashes.put(taskId, leash);

            mChildrenTaskInfo.put(taskId, taskInfo);

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

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

                    taskInfo.isVisible && taskInfo.isVisibleRequested);

            if (ENABLE_SHELL_TRANSITIONS) {

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

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

            mChildrenTaskInfo.put(taskInfo.taskId, taskInfo);

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

                    taskInfo.isVisible);

                    taskInfo.isVisible && taskInfo.isVisibleRequested);

            if (!ENABLE_SHELL_TRANSITIONS) {

                updateChildTaskSurface(

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

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

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

        info.isFocused = isFocused();

        info.isVisible = hasVisibleChildren();

        info.isVisibleRequested = isVisibleRequested();

        info.isSleeping = shouldSleepActivities();

        info.isLetterboxDoubleTapEnabled = top != null

                && top.mLetterboxUiController.isLetterboxDoubleTapEducationEnabled();