[Android] Remove DebugLogService from gui package

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Nov 10 17:05:14 2015 +0100| [65d491b0e176deb325510d467d6c8dc6831d59c1] | committer: Geoffrey Métais

Remove DebugLogService from gui package

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=65d491b0e176deb325510d467d6c8dc6831d59c1
---

 vlc-android/AndroidManifest.xml                                    |    2 +-
 vlc-android/src/org/videolan/vlc/{gui => }/DebugLogService.java    |    4 ++--
 vlc-android/src/org/videolan/vlc/{gui => }/IDebugLogService.aidl   |    4 ++--
 .../src/org/videolan/vlc/{gui => }/IDebugLogServiceCallback.aidl   |    2 +-
 vlc-android/src/org/videolan/vlc/gui/DebugLogActivity.java         |    1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index 5ca30ff..f81f214 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/vlc-android/AndroidManifest.xml
@@ -80,7 +80,7 @@
 
         <activity android:name=".gui.DebugLogActivity"
                   android:launchMode="singleTop" />
-        <service android:name=".gui.DebugLogService"
+        <service android:name=".DebugLogService"
                  android:process=":logger" />
 
         <activity
diff --git a/vlc-android/src/org/videolan/vlc/gui/DebugLogService.java b/vlc-android/src/org/videolan/vlc/DebugLogService.java
similarity index 99%
rename from vlc-android/src/org/videolan/vlc/gui/DebugLogService.java
rename to vlc-android/src/org/videolan/vlc/DebugLogService.java
index b1cb33e..9f754d9 100644
--- a/vlc-android/src/org/videolan/vlc/gui/DebugLogService.java
+++ b/vlc-android/src/org/videolan/vlc/DebugLogService.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-package org.videolan.vlc.gui;
+package org.videolan.vlc;
 
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -35,7 +35,7 @@ import android.os.RemoteException;
 import android.support.v4.app.NotificationCompat;
 import android.text.format.DateFormat;
 
-import org.videolan.vlc.R;
+import org.videolan.vlc.gui.DebugLogActivity;
 import org.videolan.vlc.util.AndroidDevices;
 import org.videolan.vlc.util.Logcat;
 import org.videolan.vlc.util.Util;
diff --git a/vlc-android/src/org/videolan/vlc/gui/IDebugLogService.aidl b/vlc-android/src/org/videolan/vlc/IDebugLogService.aidl
similarity index 93%
rename from vlc-android/src/org/videolan/vlc/gui/IDebugLogService.aidl
rename to vlc-android/src/org/videolan/vlc/IDebugLogService.aidl
index 0ea7d02..59f407f 100644
--- a/vlc-android/src/org/videolan/vlc/gui/IDebugLogService.aidl
+++ b/vlc-android/src/org/videolan/vlc/IDebugLogService.aidl
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-package org.videolan.vlc.gui;
-import org.videolan.vlc.gui.IDebugLogServiceCallback;
+package org.videolan.vlc;
+import org.videolan.vlc.IDebugLogServiceCallback;
 
 interface IDebugLogService
 {
diff --git a/vlc-android/src/org/videolan/vlc/gui/IDebugLogServiceCallback.aidl b/vlc-android/src/org/videolan/vlc/IDebugLogServiceCallback.aidl
similarity index 97%
rename from vlc-android/src/org/videolan/vlc/gui/IDebugLogServiceCallback.aidl
rename to vlc-android/src/org/videolan/vlc/IDebugLogServiceCallback.aidl
index 7421b6e..5852b23 100644
--- a/vlc-android/src/org/videolan/vlc/gui/IDebugLogServiceCallback.aidl
+++ b/vlc-android/src/org/videolan/vlc/IDebugLogServiceCallback.aidl
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-package org.videolan.vlc.gui;
+package org.videolan.vlc;
 
 interface IDebugLogServiceCallback
 {
diff --git a/vlc-android/src/org/videolan/vlc/gui/DebugLogActivity.java b/vlc-android/src/org/videolan/vlc/gui/DebugLogActivity.java
index 680ff0a..095acf1 100644
--- a/vlc-android/src/org/videolan/vlc/gui/DebugLogActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/DebugLogActivity.java
@@ -27,6 +27,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
 
+import org.videolan.vlc.DebugLogService;
 import org.videolan.vlc.R;
 import org.videolan.vlc.VLCApplication;
 import org.videolan.vlc.gui.helpers.UiTools;