Merge "Revert "Treat UNKNOWN tooltype events as Mouse events."" (ebb173e3) · Commits · e / os / android_frameworks_base

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