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

Commit b44cc17d authored by Mady Mellor's avatar Mady Mellor Committed by Android Git Automerger
Browse files

am 9629f637: am 9c98b859: Merge "Update stylus gesture to access quick... 

am 9629f637: am 9c98b859: Merge "Update stylus gesture to access quick settings to use the new buttons" into mnc-dev

* commit '9629f637':
  Update stylus gesture to access quick settings to use the new buttons
parents b1322a2a 9629f637

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

+19 −8
Original line number Diff line number Diff line
@@ -773,14 +773,7 @@ public class NotificationPanelView extends PanelView implements 
                && mQsExpansionEnabled) {

            mTwoFingerQsExpandPossible = true;

        }

        final int pointerCount = event.getPointerCount();

        final boolean twoFingerDrag = action == MotionEvent.ACTION_POINTER_DOWN

                && pointerCount == 2;

        final boolean stylusClickDrag = action == MotionEvent.ACTION_DOWN

                && pointerCount == 1 && event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS

                && (event.isButtonPressed(MotionEvent.BUTTON_SECONDARY)

                        || event.isButtonPressed(MotionEvent.BUTTON_TERTIARY));

        if (mTwoFingerQsExpandPossible && (twoFingerDrag || stylusClickDrag)

        if (mTwoFingerQsExpandPossible && isOpenQsEvent(event)

                && event.getY(event.getActionIndex()) < mStatusBarMinHeight) {

            MetricsLogger.count(mContext, COUNTER_PANEL_OPEN_QS, 1);

            mQsExpandImmediate = true;
@@ -799,6 +792,24 @@ public class NotificationPanelView extends PanelView implements 
                || y <= mQsContainer.getY() + mQsContainer.getHeight());

    }



    private boolean isOpenQsEvent(MotionEvent event) {

        final int pointerCount = event.getPointerCount();

        final int action = event.getActionMasked();



        final boolean twoFingerDrag = action == MotionEvent.ACTION_POINTER_DOWN

                && pointerCount == 2;



        final boolean stylusButtonClickDrag = action == MotionEvent.ACTION_DOWN

                && (event.isButtonPressed(MotionEvent.BUTTON_STYLUS_PRIMARY)

                        || event.isButtonPressed(MotionEvent.BUTTON_STYLUS_SECONDARY));



        final boolean mouseButtonClickDrag = action == MotionEvent.ACTION_DOWN

                && (event.isButtonPressed(MotionEvent.BUTTON_SECONDARY)

                        || event.isButtonPressed(MotionEvent.BUTTON_TERTIARY));



        return twoFingerDrag || stylusButtonClickDrag || mouseButtonClickDrag;

    }



    private void handleQsDown(MotionEvent event) {

        if (event.getActionMasked() == MotionEvent.ACTION_DOWN

                && shouldQuickSettingsIntercept(event.getX(), event.getY(), -1)) {