Merge "Ignore source hint rect if it is too small" into sc-dev am: a50c38c457 am: 443d89cec5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14930117 Change-Id: Ibe48e0a5fb7d38cdf46a9172a721b3a30ee2c654
This commit is contained in:
@@ -121,6 +121,15 @@ public class SwipePipToHomeAnimator extends ValueAnimator {
|
|||||||
mDestinationBoundsAnimation.set(mDestinationBounds);
|
mDestinationBoundsAnimation.set(mDestinationBounds);
|
||||||
mSurfaceTransactionHelper = new PipSurfaceTransactionHelper(cornerRadius);
|
mSurfaceTransactionHelper = new PipSurfaceTransactionHelper(cornerRadius);
|
||||||
|
|
||||||
|
if (sourceRectHint != null && (sourceRectHint.width() < destinationBounds.width()
|
||||||
|
|| sourceRectHint.height() < destinationBounds.height())) {
|
||||||
|
// This is a situation in which the source hint rect on at least one axis is smaller
|
||||||
|
// than the destination bounds, which presents a problem because we would have to scale
|
||||||
|
// up that axis to fit the bounds. So instead, just fallback to the non-source hint
|
||||||
|
// animation in this case.
|
||||||
|
sourceRectHint = null;
|
||||||
|
}
|
||||||
|
|
||||||
if (sourceRectHint == null) {
|
if (sourceRectHint == null) {
|
||||||
mSourceHintRectInsets = null;
|
mSourceHintRectInsets = null;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user