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

Commit 685b9b0d authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Set correct bounds when docked stack is removed" into nyc-dev 

am: 1e9c685d

* commit '1e9c685d':
  Set correct bounds when docked stack is removed

Change-Id: I344952d5c5d00a67ebd446bcfd73b72172b6f3d7
parents aa2936af 1e9c685d

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

+6 −4
Original line number Diff line number Diff line
@@ -2069,14 +2069,16 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                // static stacks need to be adjusted so they don't overlap with the docked stack.

                // We get the bounds to use from window manager which has been adjusted for any

                // screen controls and is also the same for all stacks.

                if (dockedBounds != null) {

                    mWindowManager.getStackDockedModeBounds(

                            HOME_STACK_ID, tempRect, true /* ignoreVisibility */);

                }

                for (int i = FIRST_STATIC_STACK_ID; i <= LAST_STATIC_STACK_ID; i++) {

                    if (StackId.isResizeableByDockedStack(i)) {

                        ActivityStack otherStack = getStack(i);

                        if (otherStack != null) {

                            resizeStackLocked(i, tempRect, tempOtherTaskBounds,

                                    tempOtherTaskInsetBounds, preserveWindows,

                            resizeStackLocked(i, dockedBounds != null ? tempRect : null,

                                    tempOtherTaskBounds, tempOtherTaskInsetBounds, preserveWindows,

                                    true /* allowResizeInDockedMode */);

                        }

                    }