Merge "Set correct bounds when docked stack is removed" into nyc-dev (1e9c685d) · Commits · e / os / android_frameworks_base

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 */);
		}
		}