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

Commit 27213d9c authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Disable opening expanded QS from the lockscreen on large screen... 

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

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

Change-Id: I884144316b606f98e51ccbde146ce7c33f97a93f
parents 145e5008 e38c9622

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

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