Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable opening expanded QS from the lockscreen on large screen devices" into sc-v2-dev am: 1574259ef2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16004856

Change-Id: I190ef99c8227e9c2f479784920a7bb3095549a55
This commit is contained in:
Michał Brzeziński
2021-10-08 10:59:11 +00:00
committed by Automerger Merge Worker
parent f904b4c886 1574259ef2
commit e38c96222b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -2690,8 +2690,9 @@ public class NotificationPanelViewController extends PanelViewController {
* @return Whether we should intercept a gesture to open Quick Settings. * @return Whether we should intercept a gesture to open Quick Settings.
*/ */
private boolean shouldQuickSettingsIntercept(float x, float y, float yDiff) { private boolean shouldQuickSettingsIntercept(float x, float y, float yDiff) {
if (!isQsExpansionEnabled() || mCollapsedOnDown || (mKeyguardShowing if (!isQsExpansionEnabled() || mCollapsedOnDown
&& mKeyguardBypassController.getBypassEnabled())) { || (mKeyguardShowing && mKeyguardBypassController.getBypassEnabled())
|| (mKeyguardShowing && mShouldUseSplitNotificationShade)) {
return false; return false;
} }
View header = mKeyguardShowing || mQs == null ? mKeyguardStatusBar : mQs.getHeader(); View header = mKeyguardShowing || mQs == null ? mKeyguardStatusBar : mQs.getHeader();