Move event handler to its own file.
Change-Id: If9e14ec381bfb09f5d57a405956612fb17c3ac1b
diff --git a/src/com/android/documentsui/base/FunctionalInterfaces.java b/src/com/android/documentsui/base/EventHandler.java
similarity index 60%
rename from src/com/android/documentsui/base/FunctionalInterfaces.java
rename to src/com/android/documentsui/base/EventHandler.java
index 936883a..0e289c9 100644
--- a/src/com/android/documentsui/base/FunctionalInterfaces.java
+++ b/src/com/android/documentsui/base/EventHandler.java
@@ -17,20 +17,10 @@
package com.android.documentsui.base;
/**
- * A container class that contains common functional interfaces used in DocumentsUI.
- *
- * This class should never be instantiated.
+ * A functional interface that handles an event and returns a boolean to indicate if the event
+ * is consumed.
*/
-public class FunctionalInterfaces {
-
- private FunctionalInterfaces() {}
-
- /**
- * A functional interface that handles an event and returns a boolean to indicate if the event
- * is consumed.
- */
- @FunctionalInterface
- public interface EventHandler<T> {
- boolean apply(T event);
- }
+@FunctionalInterface
+public interface EventHandler<T> {
+ boolean apply(T event);
}
\ No newline at end of file
diff --git a/src/com/android/documentsui/dirlist/ActionModeController.java b/src/com/android/documentsui/dirlist/ActionModeController.java
index 8038768..6ef793c 100644
--- a/src/com/android/documentsui/dirlist/ActionModeController.java
+++ b/src/com/android/documentsui/dirlist/ActionModeController.java
@@ -33,8 +33,8 @@
import com.android.documentsui.MenuManager;
import com.android.documentsui.Menus;
import com.android.documentsui.R;
-import com.android.documentsui.base.FunctionalInterfaces.EventHandler;
import com.android.documentsui.Shared;
+import com.android.documentsui.base.EventHandler;
import com.android.documentsui.dirlist.MultiSelectManager.Selection;
import java.util.function.Consumer;
diff --git a/src/com/android/documentsui/dirlist/ListeningGestureDetector.java b/src/com/android/documentsui/dirlist/ListeningGestureDetector.java
index 514c030..3526003 100644
--- a/src/com/android/documentsui/dirlist/ListeningGestureDetector.java
+++ b/src/com/android/documentsui/dirlist/ListeningGestureDetector.java
@@ -28,7 +28,7 @@
import com.android.documentsui.Events;
import com.android.documentsui.Events.InputEvent;
import com.android.documentsui.Events.MotionInputEvent;
-import com.android.documentsui.base.FunctionalInterfaces.EventHandler;
+import com.android.documentsui.base.EventHandler;
//Receives event meant for both directory and empty view, and either pass them to
//{@link UserInputHandler} for simple gestures (Single Tap, Long-Press), or intercept them for
diff --git a/src/com/android/documentsui/dirlist/UserInputHandler.java b/src/com/android/documentsui/dirlist/UserInputHandler.java
index 604ccd6..6acbfc2 100644
--- a/src/com/android/documentsui/dirlist/UserInputHandler.java
+++ b/src/com/android/documentsui/dirlist/UserInputHandler.java
@@ -26,7 +26,7 @@
import com.android.documentsui.Events;
import com.android.documentsui.Events.InputEvent;
-import com.android.documentsui.base.FunctionalInterfaces.EventHandler;
+import com.android.documentsui.base.EventHandler;
import java.util.Collections;
import java.util.function.Function;