| commit | e38c96222bf0a9e3e68d36c7aa2c523285879f49 | [log] [tgz] |
|---|---|---|
| author | Michał Brzeziński <brzezinski@google.com> | Fri Oct 08 10:59:11 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 10:59:11 2021 +0000 |
| tree | a606dc6c04a4d350eb8b32ef9af4621494deb548 | |
| parent | f904b4c886c92eb71be696f791ad2d5d270601d1 [diff] | |
| parent | 1574259ef2a443aad582dedabfe654ce2c413423 [diff] |
Merge "Disable opening expanded QS from the lockscreen on large screen devices" into sc-v2-dev am: 1574259ef2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16004856 Change-Id: I190ef99c8227e9c2f479784920a7bb3095549a55
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 c73c6e3..386990c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -2690,8 +2690,9 @@ * @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();