From a3dbe509c1d4a46efc71ed8275b65202c9606056 Mon Sep 17 00:00:00 2001
From: Jeff DeCew <jeffdq@google.com>
Date: Fri, 26 May 2023 13:37:05 -0400
Subject: [PATCH] Clear mTouchedView when a snap-back animation ends

Bug: 259529672
Test: dumpsysui SwipeHelper
Change-Id: Iff38e3721a4abfa613974e6df32cb178c3a73fb9
---
 packages/SystemUI/src/com/android/systemui/SwipeHelper.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
index c30a2146436c6..ff9dfc697b678 100644
--- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
@@ -548,6 +548,10 @@ public class SwipeHelper implements Gefingerpoken, Dumpable {
             if (!cancelled) {
                 updateSwipeProgressFromOffset(animView, canBeDismissed);
                 resetSwipeOfView(animView);
+                // Clear the snapped view after success, assuming it's not being swiped now
+                if (animView == mTouchedView && !mIsSwiping) {
+                    mTouchedView = null;
+                }
             }
             onChildSnappedBack(animView, targetLeft);
         });