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

Commit f2ac44cd authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Allowing to drag down while the quick settings are expanded"... 

Merge "Merge "Allowing to drag down while the quick settings are expanded" into qt-r1-dev am: 1a659660 am: e0c8e258 am: 67601775"
parents 59687971 42b73d4c

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

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

        if (mNotificationPanel.isFullyExpanded()

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

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

                && !mService.isBouncerShowing()

                && !mService.isBouncerShowing()

                && !mBypassController.getBypassEnabled()

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

                && !mService.isDozing()) {

                && !mService.isDozing()) {

            intercept = mDragDownHelper.onInterceptTouchEvent(ev);

            intercept = mDragDownHelper.onInterceptTouchEvent(ev);

        }

        }