From d711595081ca564349997159848d935914adb059 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Tue, 15 Mar 2022 16:53:13 +0000 Subject: [PATCH] Bouncer: Use Y coord delta instead of velocity. Use Y coord delta instead of velocity to determine interaction type for falsing manager. This is because it can often times be incorrect and lead to a TypeClassifier error. Bug: 224785498 Test: Manual on 2 devices Change-Id: I6b9e1ad582fcb2f8bf0be9e70766c1424e44e4cc --- .../android/systemui/statusbar/phone/PanelViewController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 24f5ff86a794a..78edc07c85440 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 @@ public abstract class PanelViewController { 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 @@ public abstract class PanelViewController { return true; } - @Classifier.InteractionType int interactionType = vel > 0 + @Classifier.InteractionType int interactionType = y - mInitialTouchY > 0 ? QUICK_SETTINGS : ( mKeyguardStateController.canDismissLockScreen() ? UNLOCK : BOUNCER_UNLOCK);