Merge "PiP: When there's an animation happening, use animator's destBounds." into rvc-dev (c0f177b1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -504,9 +504,19 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		// this could happen if rotation finishes before the animation
		mLastReportedBounds.set(destinationBoundsOut);
		scheduleFinishResizePip(mLastReportedBounds);
		} else if (!mLastReportedBounds.isEmpty()) {
		} else {
		// There could be an animation on-going. If there is one on-going, last-reported
		// bounds isn't yet updated. We'll use the animator's bounds instead.
		if (animator != null && animator.isRunning()) {
		if (!animator.getDestinationBounds().isEmpty()) {
		destinationBoundsOut.set(animator.getDestinationBounds());
		}
		} else {
		if (!mLastReportedBounds.isEmpty()) {
		destinationBoundsOut.set(mLastReportedBounds);
		}
		}
		}
		return;
		}