Revert "Treat UNKNOWN tooltype events as Mouse events."

https://buganizer.corp.google.com/u/0/issues/24904588 has been fixed.

This reverts commit 260c6980ce.

Change-Id: I341513c06a7bfda364b0efd675e785ce766d5819
This commit is contained in:
Steve McKay
2015-10-22 13:57:50 -07:00
parent 5c1b9613da
commit e4e667e022

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.
*/