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

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

Change-Id: If3a94256083aae4a4c57fab19f87a9033401ee6c

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java

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