| commit | 756239c40518789be8bf8fc09a3e4d91d230f508 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Sun Jun 13 23:20:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jun 13 23:20:13 2021 +0000 |
| tree | f44351d2f670ceb09b58c2d6b410d76905164ae9 | |
| parent | 32766574db25aefb36e596dae4da49dd837a63a0 [diff] | |
| parent | 98ed38f62b25e005735d37fb3242b07cd083cd25 [diff] |
Merge "Ignore source hint rect if it is too small" into sc-dev am: a50c38c457 am: 98ed38f62b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14930117 Change-Id: I033bec716930f4039a90aa148a46e9c8e30eaaa6
diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java index 3631130..1062652 100644 --- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java +++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -121,6 +121,15 @@ mDestinationBoundsAnimation.set(mDestinationBounds); 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) { mSourceHintRectInsets = null;