Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4e667e0 authored by Steve McKay's avatar Steve McKay
Browse files

Revert "Treat UNKNOWN tooltype events as Mouse events." 

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

This reverts commit 260c6980.

Change-Id: I341513c06a7bfda364b0efd675e785ce766d5819
parent 5c1b9613

packages/DocumentsUI/src/com/android/documentsui/Events.java

+2 −11
Original line number Diff line number Diff line
@@ -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.

     */