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

Commit 35cdba92 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into... 

Merge "Don't specify stack bounds for unsizeable home stack in dock mode" into oc-dev am: f4472b65
am: a805e2cc

Change-Id: Ie36d9fd65d934f270c7f648bb37b42a7d93a8739
parents d3ed82bb a805e2cc

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

+11 −4
Original line number Diff line number Diff line
@@ -733,10 +733,17 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye 
        outTempTaskBounds.setEmpty();



        // When the home stack is resizable, should always have the same stack and task bounds

        if (mStackId == HOME_STACK_ID && findHomeTask().isResizeable()) {

            // Calculate the home stack bounds when in docked mode

        if (mStackId == HOME_STACK_ID) {

            if (findHomeTask().isResizeable()) {

                // Calculate the home stack bounds when in docked mode and the home stack is

                // resizeable.

                getDisplayContent().mDividerControllerLocked

                        .getHomeStackBoundsInDockedMode(outStackBounds);

            } else {

                // Home stack isn't resizeable, so don't specify stack bounds.

                outStackBounds.setEmpty();

            }



            outTempTaskBounds.set(outStackBounds);

            return;

        }