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

Commit 5f1fb46e authored by Selim Cinek's avatar Selim Cinek
Browse files

Made the drag down anywhere on lockscreen go to the shade locked 

Previously we would allow going to the expanded qs first.

Fixes: 137552697
Test: drag down on top while bypassing
Change-Id: Ia4a31e1ce4e8a85f5c23b4dd2db2f6de2d2c112e
parent 0497a187

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

+2 −1
Original line number Diff line number Diff line
@@ -1967,7 +1967,8 @@ public class NotificationPanelView extends PanelView implements 
     * @return Whether we should intercept a gesture to open Quick Settings.

     */

    private boolean shouldQuickSettingsIntercept(float x, float y, float yDiff) {

        if (!mQsExpansionEnabled || mCollapsedOnDown) {

        if (!mQsExpansionEnabled || mCollapsedOnDown

                || (mKeyguardShowing && mKeyguardBypassController.getBypassEnabled())) {

            return false;

        }

        View header = mKeyguardShowing || mQs == null ? mKeyguardStatusBar : mQs.getHeader();

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

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ public class StatusBarWindowView extends FrameLayout { 
        if (mNotificationPanel.isFullyExpanded()

                && mStatusBarStateController.getState() == StatusBarState.KEYGUARD

                && !mService.isBouncerShowing()

                && (!mBypassController.getBypassEnabled() || mNotificationPanel.isQsExpanded())

                && !mBypassController.getBypassEnabled()

                && !mService.isDozing()) {

            intercept = mDragDownHelper.onInterceptTouchEvent(ev);

        }