diff options
| author | Mady Mellor <madym@google.com> | 2015-05-21 17:46:58 -0700 |
|---|---|---|
| committer | Mady Mellor <madym@google.com> | 2015-05-21 17:46:58 -0700 |
| commit | 772fcb96f19fbd6b86ac562863714019909634bf (patch) | |
| tree | 166e582bf9b3549207e11729ee987bb40da6a4e0 /core/java | |
| parent | 59845bef8e66c278c728744785852b8799d832fc (diff) | |
| download | frameworks_base-772fcb96f19fbd6b86ac562863714019909634bf.zip frameworks_base-772fcb96f19fbd6b86ac562863714019909634bf.tar.gz frameworks_base-772fcb96f19fbd6b86ac562863714019909634bf.tar.bz2 | |
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
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ScaleGestureDetector.java | 4 |
1 files changed, 2 insertions, 2 deletions
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; |