From 772fcb96f19fbd6b86ac562863714019909634bf Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Thu, 21 May 2015 17:46:58 -0700 Subject: 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 --- core/java/android/view/ScaleGestureDetector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/java') diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index b055efe..7b0f1fb 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -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; -- cgit v1.1