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

am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev

Browse Source 
* commit '3aa33b3da04774d76e1a65b749667450dc81532b':
  Update button to BUTTON_STYLUS_PRIMARY
This commit is contained in:
Mady Mellor
2015-06-01 16:24:56 +00:00
committed by Android Git Automerger
parent e531d8135d 3aa33b3da0
commit a8fa3e50ea
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;