From 5f1fb46ed9cb002303f53a2c70d0baa233bf5153 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Tue, 30 Jul 2019 13:57:01 -0700 Subject: [PATCH] Made the drag down anywhere on lockscreen go to the shade locked Previously we would allow going to the expanded qs first. Fixes: 137552697 Test: drag down on top while bypassing Change-Id: Ia4a31e1ce4e8a85f5c23b4dd2db2f6de2d2c112e --- .../systemui/statusbar/phone/NotificationPanelView.java | 3 ++- .../android/systemui/statusbar/phone/StatusBarWindowView.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 28a9a0a7f14b9..a0847b62eddb2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -1967,7 +1967,8 @@ public class NotificationPanelView extends PanelView implements * @return Whether we should intercept a gesture to open Quick Settings. */ private boolean shouldQuickSettingsIntercept(float x, float y, float yDiff) { - if (!mQsExpansionEnabled || mCollapsedOnDown) { + if (!mQsExpansionEnabled || mCollapsedOnDown + || (mKeyguardShowing && mKeyguardBypassController.getBypassEnabled())) { return false; } View header = mKeyguardShowing || mQs == null ? mKeyguardStatusBar : mQs.getHeader(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index d98ac240d62f4..94054188d7690 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -419,7 +419,7 @@ public class StatusBarWindowView extends FrameLayout { if (mNotificationPanel.isFullyExpanded() && mStatusBarStateController.getState() == StatusBarState.KEYGUARD && !mService.isBouncerShowing() - && (!mBypassController.getBypassEnabled() || mNotificationPanel.isQsExpanded()) + && !mBypassController.getBypassEnabled() && !mService.isDozing()) { intercept = mDragDownHelper.onInterceptTouchEvent(ev); }