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

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

am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 

* commit '8de52276':
  Update button to BUTTON_STYLUS_PRIMARY
parents ee8ac623 8de52276

core/java/android/view/ScaleGestureDetector.java

+2 −2
Original line number Diff line number Diff line
@@ -320,8 +320,8 @@ public class ScaleGestureDetector { 
        }



        final int count = event.getPointerCount();

        final boolean isStylusButtonDown = (event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS)

                && (event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0;

        final boolean isStylusButtonDown =

                (event.getButtonState() & MotionEvent.BUTTON_STYLUS_PRIMARY) != 0;



        final boolean anchoredScaleCancelled =

                mAnchoredScaleMode == ANCHORED_SCALE_MODE_STYLUS && !isStylusButtonDown;

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -741,8 +741,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                    final float newX = motionEvent.getRawX();

                    final float newY = motionEvent.getRawY();

                    final boolean isStylusButtonDown =

                            (motionEvent.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS)

                            && (motionEvent.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0;

                            (motionEvent.getButtonState() & MotionEvent.BUTTON_STYLUS_PRIMARY) != 0;



                    if (mIsStartEvent) {

                        if (isStylusButtonDown) {