Move OnButtonListener to same package as screen manager

5 files changed, 32 insertions, 34 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java
index e3841ce07..757486634 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java
@@ -2,7 +2,6 @@ package com.smartdevicelink.managers.screen;
 
 import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.managers.BaseSubManager;
-import com.smartdevicelink.managers.OnButtonListener;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.interfaces.ISdl;
diff --git a/base/src/main/java/com/smartdevicelink/managers/OnButtonListener.java b/base/src/main/java/com/smartdevicelink/managers/OnButtonListener.java
deleted file mode 100644
index 0c8410ebd..000000000
--- a/base/src/main/java/com/smartdevicelink/managers/OnButtonListener.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.smartdevicelink.managers;
-
-import com.smartdevicelink.proxy.rpc.OnButtonEvent;
-import com.smartdevicelink.proxy.rpc.OnButtonPress;
-import com.smartdevicelink.proxy.rpc.enums.ButtonName;
-
-/**
- * OnButtonListener is a listener used for notifying when events have happened with SubscribeButtons
- */
-public interface OnButtonListener {
-
-    /**
-     * Returns when a Subscribed button is pressed
-     * @param buttonName - Name of Button
-     * @param buttonPress - OnButtonPress
-     */
-    void onPress(ButtonName buttonName, OnButtonPress buttonPress);
-
-    /**
-     * Returns when a Subscribed button Event has occurred
-     * @param buttonName - Name of Button
-     * @param buttonEvent - OnButtonEvent
-     */
-    void onEvent(ButtonName buttonName, OnButtonEvent buttonEvent);
-
-    /**
-     * Returns when there is an error with subscribing to button
-     * @param info - Error info
-     */
-    void onError(String info);
-}
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java
index 80d693303..f75397c33 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSubscribeButtonManager.java
@@ -5,7 +5,6 @@ import android.util.Log;
 
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
-import com.smartdevicelink.managers.OnButtonListener;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
 import com.smartdevicelink.proxy.RPCResponse;
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/OnButtonListener.java b/base/src/main/java/com/smartdevicelink/managers/screen/OnButtonListener.java
new file mode 100644
index 000000000..c3b88ce6c
--- /dev/null
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/OnButtonListener.java
@@ -0,0 +1,32 @@
+package com.smartdevicelink.managers.screen;
+
+import com.smartdevicelink.proxy.rpc.OnButtonEvent;
+import com.smartdevicelink.proxy.rpc.OnButtonPress;
+import com.smartdevicelink.proxy.rpc.enums.ButtonName;
+
+    /**
+     * OnButtonListener is a listener used for notifying when events have happened with SubscribeButtons
+     */
+    public interface OnButtonListener {
+
+        /**
+         * Returns when a Subscribed button is pressed
+         * @param buttonName - Name of Button
+         * @param buttonPress - OnButtonPress
+         */
+        void onPress(ButtonName buttonName, OnButtonPress buttonPress);
+
+        /**
+         * Returns when a Subscribed button Event has occurred
+         * @param buttonName - Name of Button
+         * @param buttonEvent - OnButtonEvent
+         */
+        void onEvent(ButtonName buttonName, OnButtonEvent buttonEvent);
+
+        /**
+         * Returns when there is an error with subscribing to button
+         * @param info - Error info
+         */
+        void onError(String info);
+    }
+}
diff --git a/baseAndroid/src/main/java/com/smartdevicelink/managers/OnButtonListener.java b/baseAndroid/src/main/java/com/smartdevicelink/managers/OnButtonListener.java
deleted file mode 120000
index 7c5bd48f8..000000000
--- a/baseAndroid/src/main/java/com/smartdevicelink/managers/OnButtonListener.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../base/src/main/java/com/smartdevicelink/managers/OnButtonListener.java
\ No newline at end of file