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

Commit d8bb7268 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Don't bring stack forward when moving tasks."

parents 4ffa2337 d213beae

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

+0 −2
Original line number Diff line number Diff line
@@ -2857,8 +2857,6 @@ final class ActivityStack { 
            return;

        }



        mStackSupervisor.moveHomeStack(isHomeStack());



        // Shift all activities with this task up to the top

        // of the stack, keeping them in the same internal order.

        mTaskHistory.remove(tr);

services/java/com/android/server/am/ActivityStackSupervisor.java

+0 −4
Original line number Diff line number Diff line
@@ -1911,10 +1911,6 @@ public final class ActivityStackSupervisor { 
        }

        removeTask(task);

        stack.addTask(task, toTop);

        if (toTop) {

            moveHomeStack(stack.isHomeStack());

            setFocusedStack(task.getTopActivity());

        }

        mWindowManager.addTask(taskId, stackId, toTop);

        resumeTopActivitiesLocked();

    }

services/java/com/android/server/wm/WindowManagerService.java

+0 −3
Original line number Diff line number Diff line
@@ -4855,9 +4855,6 @@ public class WindowManagerService extends IWindowManager.Stub 
            TaskStack stack = mStackIdToStack.get(stackId);

            stack.addTask(task, toTop);

            final DisplayContent displayContent = stack.getDisplayContent();

            if (toTop) {

                displayContent.moveHomeStackBox(stack.isHomeStack());

            }

            displayContent.layoutNeeded = true;

            performLayoutAndPlaceSurfacesLocked();

        }