Merge "End screenshot animation early on layout change" into sc-dev am: 719cd831a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14922737

Change-Id: I3079e0a2e17f0528518c34c5d5e3a4d630f9afd1
This commit is contained in:
Miranda Kephart
2021-06-18 15:07:33 +00:00
committed by Automerger Merge Worker

View File

@@ -573,6 +573,10 @@ public class ScreenshotController {
mScreenshotView.updateDisplayCutoutMargins( mScreenshotView.updateDisplayCutoutMargins(
mWindowManager.getCurrentWindowMetrics().getWindowInsets() mWindowManager.getCurrentWindowMetrics().getWindowInsets()
.getDisplayCutout()); .getDisplayCutout());
// screenshot animation calculations won't be valid anymore, so just end
if (mScreenshotAnimation != null && mScreenshotAnimation.isRunning()) {
mScreenshotAnimation.end();
}
} }
}); });
}); });