Merge "Don't clear source bounds when set to null during an animation." into qt-dev am: a6ef44cecd (79f1b594) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -319,7 +319,8 @@ public class TaskStack extends WindowContainer<Task> implements
		* Sets the bounds animation target bounds ahead of an animation. This can't currently be done
		* in onAnimationStart() since that is started on the UiThread.
		*/
		void setAnimationFinalBounds(Rect sourceHintBounds, Rect destBounds, boolean toFullscreen) {
		private void setAnimationFinalBounds(Rect sourceHintBounds, Rect destBounds,
		boolean toFullscreen) {
		mBoundsAnimatingRequested = true;
		mBoundsAnimatingToFullscreen = toFullscreen;
		if (destBounds != null) {
		@@ -329,7 +330,11 @@ public class TaskStack extends WindowContainer<Task> implements
		}
		if (sourceHintBounds != null) {
		mBoundsAnimationSourceHintBounds.set(sourceHintBounds);
		} else {
		} else if (!mBoundsAnimating) {
		// If the bounds are already animating, we don't want to reset the source hint. This is
		// because the source hint is sent when starting the animation from the client that
		// requested to enter pip. Other requests can adjust the pip bounds during an animation,
		// but could accidentally reset the source hint bounds.
		mBoundsAnimationSourceHintBounds.setEmpty();
		}