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

Commit 7b64dbd5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set correct task remove mode when reparenting" into oc-dev

parents 13af9176 56d8d16c

services/core/java/com/android/server/am/ActivityStack.java

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
    static final int REMOVE_TASK_MODE_MOVING = 1;

    // Similar to {@link #REMOVE_TASK_MODE_MOVING} and the task will be added to the top of its new

    // stack and the new stack will be on top of all stacks.

    private static final int REMOVE_TASK_MODE_MOVING_TO_TOP = 2;

    static final int REMOVE_TASK_MODE_MOVING_TO_TOP = 2;



    // The height/width divide used when fitting a task within a bounds with method

    // {@link #fitWithinBounds}.

services/core/java/com/android/server/am/TaskRecord.java

+5 −3
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ import static com.android.server.am.ActivityRecord.HOME_ACTIVITY_TYPE; 
import static com.android.server.am.ActivityRecord.RECENTS_ACTIVITY_TYPE;

import static com.android.server.am.ActivityRecord.STARTING_WINDOW_SHOWN;

import static com.android.server.am.ActivityStack.REMOVE_TASK_MODE_MOVING;

import static com.android.server.am.ActivityStack.REMOVE_TASK_MODE_MOVING_TO_TOP;

import static com.android.server.am.ActivityStackSupervisor.PAUSE_IMMEDIATELY;

import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS;
@@ -673,8 +674,11 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta 
            mWindowContainerController.reparent(toStack.getWindowContainerController(), position,

                    moveStackMode == REPARENT_MOVE_STACK_TO_FRONT);



            final boolean moveStackToFront = moveStackMode == REPARENT_MOVE_STACK_TO_FRONT

                    || (moveStackMode == REPARENT_KEEP_STACK_AT_FRONT && (wasFocused || wasFront));

            // Move the task

            sourceStack.removeTask(this, reason, REMOVE_TASK_MODE_MOVING);

            sourceStack.removeTask(this, reason, moveStackToFront

                    ? REMOVE_TASK_MODE_MOVING_TO_TOP : REMOVE_TASK_MODE_MOVING);

            toStack.addTask(this, position, false /* schedulePictureInPictureModeChange */, reason);



            if (schedulePictureInPictureModeChange) {
@@ -693,8 +697,6 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta 


            // If the task had focus before (or we're requested to move focus), move focus to the

            // new stack by moving the stack to the front.

            final boolean moveStackToFront = moveStackMode == REPARENT_MOVE_STACK_TO_FRONT

                    || (moveStackMode == REPARENT_KEEP_STACK_AT_FRONT && (wasFocused || wasFront));

            if (r != null) {

                toStack.moveToFrontAndResumeStateIfNeeded(r, moveStackToFront, wasResumed,

                        wasPaused, reason);