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

Commit 8b8cad8b authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Don't resize task in current stack when moving it to a docked stack"

parents af4e3612 eb8e56c8

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

+6 −0
Original line number Diff line number Diff line
@@ -3216,7 +3216,13 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        final boolean wasFocused = isFrontStack(task.stack) && (topRunningActivityLocked() == r);

        final boolean wasResumed = wasFocused && (task.stack.mResumedActivity == r);



        final boolean resizeable = task.mResizeable;

        // Temporarily disable resizeablility of task we are moving. We don't want it to be resized

        // if a docked stack is created below which will lead to the stack we are moving from and

        // its resizeable tasks being resized.

        task.mResizeable = false;

        final ActivityStack stack = getStack(stackId, CREATE_IF_NEEDED, toTop);

        task.mResizeable = resizeable;

        mWindowManager.moveTaskToStack(task.taskId, stack.mStackId, toTop);

        if (task.stack != null) {

            task.stack.removeTask(task, reason, MOVING);