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

Commit 772fcb96 authored by Mady Mellor's avatar Mady Mellor
Browse files

Update button to BUTTON_STYLUS_PRIMARY 

MotioneEvent.BUTTON_SECONDARY is no longer used for M+, instead it will
be BUTTON_STYLUS_PRIMARY.

Bug: 21148238
Change-Id: If08a82e7be57798a2a747d29436e0411c76ef58f
parent 59845bef

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
@@ -739,8 +739,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) {