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

Merge "Revert "Treat UNKNOWN tooltype events as Mouse events.""

Browse Source
This commit is contained in:
Steve McKay
2015-10-23 15:33:03 +00:00
committed by Android (Google) Code Review
parent ca4d8e9db4 e4e667e022
commit ebb173e3b5
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/DocumentsUI/src/com/android/documentsui/Events.java
View File

@@ -38,9 +38,7 @@ final class Events {
* Returns true if event was triggered by a finger or stylus touch.
*/
static boolean isTouchEvent(MotionEvent e) {
return isTouchType(e.getToolType(0))
// Temporarily work around uiautomator's missing tool type support.
|| isUnknownType(e.getToolType(0));
return isTouchType(e.getToolType(0));
}
/**
@@ -51,20 +49,13 @@ final class Events {
}
/**
* Returns true if type is finger or stylus.
* Returns true if event was triggered by a finger or stylus touch.
*/
static boolean isTouchType(int toolType) {
return toolType == MotionEvent.TOOL_TYPE_FINGER
|| toolType == MotionEvent.TOOL_TYPE_STYLUS;
}
/**
* Returns true if type is unknown.
*/
static boolean isUnknownType(int toolType) {
return toolType == MotionEvent.TOOL_TYPE_UNKNOWN;
}
/**
* Returns true if event was triggered by a finger or stylus touch.
*/