commit f6f5aeeed7e9fef98d91b23c53549dc10e48336c
author Shawn Lee <syeonlee@google.com> Mon Jun 10 16:35:14 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 10 16:35:14 2024 +0000
tree a4aaedd70c1940b053383de2f2630a1a9071f30b
parent 55d2c85707b5aad4f1b7d0393178ed537833b2e4
parent 5c06e42976cdff7bb48b371195e1a092d5faf64b

Merge "[flexiglass] Fix NSSL-Flexiglass touch in default case" into main

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
index fe22cc6..efd631f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java
@@ -3471,6 +3471,7 @@
             }
 
             if (isUpOrCancel) {
+                mScrollViewFields.sendCurrentGestureOverscroll(false);
                 setIsBeingDragged(false);
             }
             return false;
@@ -3606,7 +3607,6 @@
                 if (mIsBeingDragged) {
                     // Defer actual scrolling to the scene framework if enabled
                     if (SceneContainerFlag.isEnabled()) {
-                        setIsBeingDragged(false);
                         return false;
                     }
                     // Scroll to follow the motion event