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

Commit 42b73d4c authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

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

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

Change-Id: I60ae401a06c67ba06164b07d21694b7f8eb4dc89
parents 5e983e27 67601775

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);

        }

        }