Merge Stack level of window hierarchy (63/n)
Bug: 80414790
Test: Existing tests pass
Change-Id: Ia6765f7ebd89b38e0d2b88ed1cdfec5b386a0774
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 80232d3..32f4652 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -2619,7 +2619,7 @@
throw new IllegalArgumentException("Stack: " + stackId
+ " doesn't support animated resize.");
}
- stack.animateResizePinnedStack(null /* sourceHintBounds */, destBounds,
+ stack.animateResizePinnedStack(destBounds, null /* sourceHintBounds */,
animationDuration, false /* fromFullscreen */);
}
} finally {
@@ -2654,7 +2654,7 @@
return;
}
destBounds.offset(xOffset, yOffset);
- stack.animateResizePinnedStack(null /* sourceHintBounds */, destBounds,
+ stack.animateResizePinnedStack(destBounds, null /* sourceHintBounds */,
animationDuration, false /* fromFullscreen */);
}
} finally {
@@ -3997,8 +3997,9 @@
+ " doesn't support animated resize.");
}
if (animate) {
- stack.animateResizePinnedStack(null /* sourceHintBounds */,
- null /* destBounds */, animationDuration, false /* fromFullscreen */);
+ stack.animateResizePinnedStack(null /* destBounds */,
+ null /* sourceHintBounds */, animationDuration,
+ false /* fromFullscreen */);
} else {
stack.dismissPip();
}
@@ -4103,7 +4104,7 @@
// If we are animating to fullscreen then we have already dispatched the PIP mode
// changed, so we should reflect that check here as well.
- final TaskStack taskStack = r.getActivityStack().getTaskStack();
+ final ActivityStack taskStack = r.getActivityStack();
return !taskStack.isAnimatingBoundsToFullscreen();
}