Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1574259e authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Android (Google) Code Review
Browse files

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

parents 0cc4156b 877a73e4

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

+3 −2
Original line number Diff line number Diff line
@@ -2696,8 +2696,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();