From e4e667e022c4cefff6abeea37f0c51fff5a1e722 Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Thu, 22 Oct 2015 13:57:50 -0700 Subject: [PATCH] Revert "Treat UNKNOWN tooltype events as Mouse events." https://buganizer.corp.google.com/u/0/issues/24904588 has been fixed. This reverts commit 260c6980cef923792c352dc8143be5cb93a3af55. Change-Id: I341513c06a7bfda364b0efd675e785ce766d5819 --- .../src/com/android/documentsui/Events.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/Events.java b/packages/DocumentsUI/src/com/android/documentsui/Events.java index c06ea0a257d74..d4c3ba3ba3c3b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/Events.java +++ b/packages/DocumentsUI/src/com/android/documentsui/Events.java @@ -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. */