Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev

Browse Source
This commit is contained in:
Mady Mellor
2015-06-01 16:17:36 +00:00
committed by Android (Google) Code Review
parent ef24bc0039 772fcb96f1
commit 3aa33b3da0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/ScaleGestureDetector.java
View File

@@ -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;

3
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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) {