commit aa917e543e6f6909db700c18b1a15ae7fac166f8
author Aaron Liu <aaronjli@google.com> Wed Mar 16 18:34:28 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 16 18:34:28 2022 +0000
tree 21f9a74d4590b9f097b59136a53ec942c8f72b8b
parent dda9495566a4f019a076f77611c71f827bdbb7c9
parent d711595081ca564349997159848d935914adb059

Merge "Bouncer: Use Y coord delta instead of velocity." into tm-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
index 24f5ff8..78edc07 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelViewController.java
@@ -445,7 +445,7 @@
                 mLockscreenGestureLogger.log(LockscreenUiEvent.LOCKSCREEN_UNLOCK);
             }
             @Classifier.InteractionType int interactionType = vel == 0 ? GENERIC
-                    : vel > 0 ? QUICK_SETTINGS
+                    : y - mInitialTouchY > 0 ? QUICK_SETTINGS
                             : (mKeyguardStateController.canDismissLockScreen()
                                     ? UNLOCK : BOUNCER_UNLOCK);
 
@@ -532,7 +532,7 @@
             return true;
         }
 
-        @Classifier.InteractionType int interactionType = vel > 0
+        @Classifier.InteractionType int interactionType = y - mInitialTouchY > 0
                 ? QUICK_SETTINGS : (
                         mKeyguardStateController.canDismissLockScreen() ? UNLOCK : BOUNCER_UNLOCK);