diff options
| author | Mady Mellor <madym@google.com> | 2015-06-01 16:17:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 16:17:37 +0000 |
| commit | 3aa33b3da04774d76e1a65b749667450dc81532b (patch) | |
| tree | 2d962d89943803e8f2d1b6c7cb8ec494e7ffd6e6 | |
| parent | ef24bc00399ceb627e9780f05eb68f955e6bd495 (diff) | |
| parent | 772fcb96f19fbd6b86ac562863714019909634bf (diff) | |
| download | frameworks_base-3aa33b3da04774d76e1a65b749667450dc81532b.zip frameworks_base-3aa33b3da04774d76e1a65b749667450dc81532b.tar.gz frameworks_base-3aa33b3da04774d76e1a65b749667450dc81532b.tar.bz2 | |
Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
| -rw-r--r-- | core/java/android/view/ScaleGestureDetector.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
2 files changed, 3 insertions, 4 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; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 7671293..5c9f87e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -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) { |