Remove unused "isTouchEvent" methods.
Update BandController to use InputEvent not contrete MotionInputEvent.
Change-Id: I47a7558d8dcebfa6c44dc9a62741487422bf0ff7
diff --git a/packages/DocumentsUI/src/com/android/documentsui/Events.java b/packages/DocumentsUI/src/com/android/documentsui/Events.java
index 2d0dbe8..95934c3f 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/Events.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/Events.java
@@ -35,34 +35,13 @@
* Returns true if event was triggered by a mouse.
*/
public static boolean isMouseEvent(MotionEvent e) {
- return isMouseType(e.getToolType(0));
- }
-
- /**
- * Returns true if event was triggered by a finger or stylus touch.
- */
- public static boolean isTouchEvent(MotionEvent e) {
- return isTouchType(e.getToolType(0));
- }
-
- /**
- * Returns true if event was triggered by a mouse.
- */
- public static boolean isMouseType(int toolType) {
+ int toolType = e.getToolType(0);
return toolType == MotionEvent.TOOL_TYPE_MOUSE;
}
/**
* Returns true if event was triggered by a finger or stylus touch.
*/
- public static boolean isTouchType(int toolType) {
- return toolType == MotionEvent.TOOL_TYPE_FINGER
- || toolType == MotionEvent.TOOL_TYPE_STYLUS;
- }
-
- /**
- * Returns true if event was triggered by a finger or stylus touch.
- */
public static boolean isActionDown(MotionEvent e) {
return e.getActionMasked() == MotionEvent.ACTION_DOWN;
}
@@ -116,7 +95,6 @@
* of related code.
*/
public interface InputEvent extends AutoCloseable {
- boolean isTouchEvent();
boolean isMouseEvent();
boolean isPrimaryButtonPressed();
boolean isSecondaryButtonPressed();
@@ -212,11 +190,6 @@
}
@Override
- public boolean isTouchEvent() {
- return Events.isTouchEvent(mEvent);
- }
-
- @Override
public boolean isMouseEvent() {
return Events.isMouseEvent(mEvent);
}
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/BandController.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/BandController.java
index 8f52036..eb53ec1 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/BandController.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/BandController.java
@@ -85,14 +85,14 @@
new RecyclerView.OnItemTouchListener() {
@Override
public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent e) {
- try (MotionInputEvent event = MotionInputEvent.obtain(e, view)) {
+ try (InputEvent event = MotionInputEvent.obtain(e, view)) {
return handleEvent(event);
}
}
@Override
public void onTouchEvent(RecyclerView rv, MotionEvent e) {
if (Events.isMouseEvent(e)) {
- try (MotionInputEvent event = MotionInputEvent.obtain(e, view)) {
+ try (InputEvent event = MotionInputEvent.obtain(e, view)) {
processInputEvent(event);
}
}
@@ -177,7 +177,7 @@
mSelection = selection;
}
- private boolean handleEvent(MotionInputEvent e) {
+ private boolean handleEvent(InputEvent e) {
// Don't start, or extend bands on right click.
if (e.isSecondaryButtonPressed()) {
return false;
@@ -230,7 +230,7 @@
}
}
- boolean shouldStart(MotionInputEvent e) {
+ boolean shouldStart(InputEvent e) {
return !isActive()
&& e.isActionDown() // the initial button press
&& mAdapter.getItemCount() > 0
diff --git a/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java b/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java
index 36e7c1b..e6936d6 100644
--- a/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java
+++ b/packages/DocumentsUI/tests/src/com/android/documentsui/TestInputEvent.java
@@ -22,11 +22,6 @@
}
@Override
- public boolean isTouchEvent() {
- return !mouseEvent;
- }
-
- @Override
public boolean isMouseEvent() {
return mouseEvent;
}