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

Commit 0f623eb8 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Disable DragDownHelper in QS" into lmp-dev

parents b120ac5b d692dd0d

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

+4 −0
Original line number Diff line number Diff line
@@ -2030,6 +2030,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        return mLeaveOpenOnKeyguardHide;

    }



    public boolean isQsExpanded() {

        return mNotificationPanel.isQsExpanded();

    }



    /**

     * All changes to the status bar and notifications funnel through here and are batched.

     */

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

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.view.View; 
import android.view.ViewRootImpl;

import android.widget.FrameLayout;



import com.android.systemui.ExpandHelper;

import com.android.systemui.R;

import com.android.systemui.statusbar.BaseStatusBar;

import com.android.systemui.statusbar.DragDownHelper;
@@ -130,7 +129,7 @@ public class StatusBarWindowView extends FrameLayout { 
    @Override

    public boolean onTouchEvent(MotionEvent ev) {

        boolean handled = false;

        if (mService.getBarState() == StatusBarState.KEYGUARD) {

        if (mService.getBarState() == StatusBarState.KEYGUARD && !mService.isQsExpanded()) {

            handled = mDragDownHelper.onTouchEvent(ev);

        }

        if (!handled) {