[Android] Refactor TV classes organization

Geoffrey Métais git at videolan.org
Tue Feb 9 17:21:59 CET 2016


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Feb  9 17:15:00 2016 +0100| [fbdbe14de9275c6b564499cb0455c9b2565938f3] | committer: Geoffrey Métais

Refactor TV classes organization

> https://code.videolan.org/videolan/vlc-android/commit/fbdbe14de9275c6b564499cb0455c9b2565938f3
---

 vlc-android/AndroidManifest.xml                                       | 4 ++--
 vlc-android/src/org/videolan/vlc/{gui/tv => }/BootupReceiver.java     | 3 +--
 .../src/org/videolan/vlc/{gui/tv => }/RecommendationsService.java     | 4 +---
 vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java           | 1 +
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/vlc-android/AndroidManifest.xml b/vlc-android/AndroidManifest.xml
index 8294b10..d569134 100644
--- a/vlc-android/AndroidManifest.xml
+++ b/vlc-android/AndroidManifest.xml
@@ -534,12 +534,12 @@
             android:theme="@style/Theme.Leanback" />
 
         <service
-            android:name="org.videolan.vlc.gui.tv.RecommendationsService"
+            android:name=".RecommendationsService"
             android:exported="false" >
         </service>
 
         <receiver
-            android:name="org.videolan.vlc.gui.tv.BootupReceiver"
+            android:name=".BootupReceiver"
             android:enabled="true"
             android:exported="true" >
           <intent-filter>
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/BootupReceiver.java b/vlc-android/src/org/videolan/vlc/BootupReceiver.java
similarity index 97%
rename from vlc-android/src/org/videolan/vlc/gui/tv/BootupReceiver.java
rename to vlc-android/src/org/videolan/vlc/BootupReceiver.java
index 3ceb505..d8e3d67 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/BootupReceiver.java
+++ b/vlc-android/src/org/videolan/vlc/BootupReceiver.java
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-package org.videolan.vlc.gui.tv;
+package org.videolan.vlc;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -27,7 +27,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import org.videolan.vlc.VLCApplication;
 import org.videolan.vlc.util.AndroidDevices;
 
 public class BootupReceiver extends BroadcastReceiver {
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/RecommendationsService.java b/vlc-android/src/org/videolan/vlc/RecommendationsService.java
similarity index 98%
rename from vlc-android/src/org/videolan/vlc/gui/tv/RecommendationsService.java
rename to vlc-android/src/org/videolan/vlc/RecommendationsService.java
index 786e50d..9fda8e7 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/RecommendationsService.java
+++ b/vlc-android/src/org/videolan/vlc/RecommendationsService.java
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-package org.videolan.vlc.gui.tv;
+package org.videolan.vlc;
 
 import android.app.IntentService;
 import android.app.Notification;
@@ -36,8 +36,6 @@ import android.text.TextUtils;
 import org.videolan.vlc.media.MediaDatabase;
 import org.videolan.vlc.media.MediaLibrary;
 import org.videolan.vlc.media.MediaWrapper;
-import org.videolan.vlc.R;
-import org.videolan.vlc.VLCApplication;
 import org.videolan.vlc.gui.preferences.PreferencesActivity;
 import org.videolan.vlc.gui.video.VideoPlayerActivity;
 import org.videolan.vlc.gui.helpers.BitmapUtil;
diff --git a/vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java b/vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java
index e1c4621..96ace21 100644
--- a/vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/tv/MainTvActivity.java
@@ -52,6 +52,7 @@ import org.videolan.libvlc.Media;
 import org.videolan.libvlc.MediaPlayer;
 import org.videolan.vlc.PlaybackService;
 import org.videolan.vlc.R;
+import org.videolan.vlc.RecommendationsService;
 import org.videolan.vlc.StartActivity;
 import org.videolan.vlc.VLCApplication;
 import org.videolan.vlc.gui.helpers.AudioUtil;



More information about the Android mailing list