From a39aece07c8d114e84480e274f252d19171d2ac4 Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Mon, 26 Jul 2021 12:20:19 -0500
Subject: [PATCH] Cancel existing QsClippingAnimation when creating new one

Bug: 191436459

[Manual tests for regressions]
Test: open shade from lockscreen, open fullscreen qs
Test: open unlocked shade, open fullscreen qs
Test: directly open fullscreen qs from top of lockscreen
Test: directly open fullscreen qs via two-finger swipe while unlocked

Change-Id: Ibb8f3e35e5fc14e4e029e98fa3dd83a20b470ebf
---
 .../statusbar/phone/NotificationPanelViewController.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
index 3c1892d4b7eae..c87a58d13d57b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -2326,6 +2326,9 @@ public class NotificationPanelViewController extends PanelViewController {
             final int startTop = mKeyguardStatusAreaClipBounds.top;
             final int startRight = mKeyguardStatusAreaClipBounds.right;
             final int startBottom = mKeyguardStatusAreaClipBounds.bottom;
+            if (mQsClippingAnimation != null) {
+                mQsClippingAnimation.cancel();
+            }
             mQsClippingAnimation = ValueAnimator.ofFloat(0.0f, 1.0f);
             mQsClippingAnimation.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
             mQsClippingAnimation.setDuration(mNotificationBoundsAnimationDuration);