From 877a73e4cd2d8d3834e520c08a943e63574a08d8 Mon Sep 17 00:00:00 2001 From: Michal Brzezinski Date: Thu, 7 Oct 2021 14:05:00 +0100 Subject: [PATCH] Disable opening expanded QS from the lockscreen on large screen devices This change disables special pull-down gesture from the top left corner that would normally open expanded quick settings. That gesture is not as relevant for large screen devices as collapsed QS is more functional already. Also disabling it means that pull down would always trigger usual lockscreen to shade animation which works nicely already and doesn't require any special work. Fixes: 190504112 Test: NotificationPanelViewControllerTest Change-Id: I303c59b06ec28df1251baa0045612cc67a8b8454 --- .../statusbar/phone/NotificationPanelViewController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java index 4862d16178371..ba047611f54b3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java @@ -2704,8 +2704,9 @@ public class NotificationPanelViewController extends PanelViewController { * @return Whether we should intercept a gesture to open Quick Settings. */ private boolean shouldQuickSettingsIntercept(float x, float y, float yDiff) { - if (!isQsExpansionEnabled() || mCollapsedOnDown || (mKeyguardShowing - && mKeyguardBypassController.getBypassEnabled())) { + if (!isQsExpansionEnabled() || mCollapsedOnDown + || (mKeyguardShowing && mKeyguardBypassController.getBypassEnabled()) + || (mKeyguardShowing && mShouldUseSplitNotificationShade)) { return false; } View header = mKeyguardShowing || mQs == null ? mKeyguardStatusBar : mQs.getHeader();