From 260c6980cef923792c352dc8143be5cb93a3af55 Mon Sep 17 00:00:00 2001 From: Steve McKay Date: Mon, 12 Oct 2015 16:07:33 -0700 Subject: [PATCH] Treat UNKNOWN tooltype events as Mouse events. Temporary fix for CTS. Eventually we'll need to update UiAutomator to support specific input tooltypes. Bug: 24544391 Change-Id: Ief339d0d35c4305811928e9605b535c7ef230f7b --- .../src/com/android/documentsui/Events.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/Events.java b/packages/DocumentsUI/src/com/android/documentsui/Events.java index d4c3ba3ba3c3b..c06ea0a257d74 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/Events.java +++ b/packages/DocumentsUI/src/com/android/documentsui/Events.java @@ -38,7 +38,9 @@ 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)); + return isTouchType(e.getToolType(0)) + // Temporarily work around uiautomator's missing tool type support. + || isUnknownType(e.getToolType(0)); } /** @@ -49,13 +51,20 @@ final class Events { } /** - * Returns true if event was triggered by a finger or stylus touch. + * Returns true if type is finger or stylus. */ 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. */