Merge pull request #21259 from joseluismarti/android-imports

[Android] Cleanup of unnecessary imports in java packages

18 files changed, 38 insertions, 78 deletions

diff --git a/tools/android/packaging/xbmc/src/Main.java.in b/tools/android/packaging/xbmc/src/Main.java.in
index a769488256..ec9f5cf700 100644
--- a/tools/android/packaging/xbmc/src/Main.java.in
+++ b/tools/android/packaging/xbmc/src/Main.java.in
@@ -1,29 +1,25 @@
 package @APP_PACKAGE@;
 
-import android.content.Context;
-import android.os.Build.VERSION_CODES;
-import android.os.Build;
+import @APP_PACKAGE@.channels.util.TvUtil;
+
 import android.app.NativeActivity;
 import android.content.ComponentName;
 import android.content.Intent;
-import android.hardware.input.InputManager;
+import android.graphics.Color;
 import android.graphics.Rect;
+import android.hardware.input.InputManager;
 import android.media.AudioManager;
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
 import android.view.Choreographer;
-import android.view.Gravity;
 import android.view.View;
-import android.graphics.Color;
-import android.graphics.PixelFormat;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.widget.RelativeLayout;
 
 import java.util.ArrayList;
 
-import @APP_PACKAGE@.channels.util.TvUtil;
-
 public class Main extends NativeActivity implements Choreographer.FrameCallback
 {
   private static final String TAG = "@APP_NAME@";
diff --git a/tools/android/packaging/xbmc/src/Splash.java.in b/tools/android/packaging/xbmc/src/Splash.java.in
index a5569ef579..8f6608c0b2 100644
--- a/tools/android/packaging/xbmc/src/Splash.java.in
+++ b/tools/android/packaging/xbmc/src/Splash.java.in
@@ -1,56 +1,51 @@
 package @APP_PACKAGE@;
 
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.System;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Properties;
-import java.util.Enumeration;
-import java.util.ArrayList;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
 import android.Manifest;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningTaskInfo;
 import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.util.Log;
+import android.content.IntentFilter;
+import android.content.res.Resources;
+import android.content.res.Resources.NotFoundException;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
+import android.util.Log;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.content.res.Resources;
-import android.content.res.Resources.NotFoundException;
-
-import android.os.Handler;
-import android.os.Message;
-import android.content.BroadcastReceiver;
-import android.content.IntentFilter;
-import android.os.Environment;
 
-import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.System;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 public class Splash extends Activity
 {
diff --git a/tools/android/packaging/xbmc/src/XBMCBroadcastReceiver.java.in b/tools/android/packaging/xbmc/src/XBMCBroadcastReceiver.java.in
index 4174c64508..d8414fb0c8 100644
--- a/tools/android/packaging/xbmc/src/XBMCBroadcastReceiver.java.in
+++ b/tools/android/packaging/xbmc/src/XBMCBroadcastReceiver.java.in
@@ -4,7 +4,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.Environment;
 import android.util.Log;
 
 public class XBMCBroadcastReceiver extends BroadcastReceiver
diff --git a/tools/android/packaging/xbmc/src/XBMCInputDeviceListener.java.in b/tools/android/packaging/xbmc/src/XBMCInputDeviceListener.java.in
index 101f2eaacb..ce26b590a8 100644
--- a/tools/android/packaging/xbmc/src/XBMCInputDeviceListener.java.in
+++ b/tools/android/packaging/xbmc/src/XBMCInputDeviceListener.java.in
@@ -1,7 +1,6 @@
 package @APP_PACKAGE@;
 
 import android.hardware.input.InputManager.InputDeviceListener;
-import android.util.Log;
 
 public class XBMCInputDeviceListener implements InputDeviceListener
 {
diff --git a/tools/android/packaging/xbmc/src/XBMCJsonRPC.java.in b/tools/android/packaging/xbmc/src/XBMCJsonRPC.java.in
index 342f6b8999..90b982c5af 100644
--- a/tools/android/packaging/xbmc/src/XBMCJsonRPC.java.in
+++ b/tools/android/packaging/xbmc/src/XBMCJsonRPC.java.in
@@ -1,8 +1,6 @@
 package @APP_PACKAGE@;
 
 import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.List;
 import java.util.ArrayList;
 
@@ -26,7 +24,6 @@ import android.net.Uri;
 import android.provider.BaseColumns;
 import android.util.Log;
 
-import @APP_PACKAGE@.content.XBMCYTDLContentProvider;
 import @APP_PACKAGE@.model.Album;
 import @APP_PACKAGE@.model.Movie;
 import @APP_PACKAGE@.model.MusicVideo;
diff --git a/tools/android/packaging/xbmc/src/XBMCMediaSession.java.in b/tools/android/packaging/xbmc/src/XBMCMediaSession.java.in
index 24ba06ba19..a6e74c22d4 100644
--- a/tools/android/packaging/xbmc/src/XBMCMediaSession.java.in
+++ b/tools/android/packaging/xbmc/src/XBMCMediaSession.java.in
@@ -1,6 +1,5 @@
 package @APP_PACKAGE@;
 
-import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.media.MediaMetadata;
@@ -8,9 +7,6 @@ import android.media.session.MediaSession;
 import android.media.session.PlaybackState;
 import android.util.Log;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.FutureTask;
-
 /**
  * Created by Christian BROWET on 1/10/17.
  */
diff --git a/tools/android/packaging/xbmc/src/XBMCVideoView.java.in b/tools/android/packaging/xbmc/src/XBMCVideoView.java.in
index c3fc5fcdea..a26fbf57ee 100644
--- a/tools/android/packaging/xbmc/src/XBMCVideoView.java.in
+++ b/tools/android/packaging/xbmc/src/XBMCVideoView.java.in
@@ -1,16 +1,11 @@
 package @APP_PACKAGE@;
 
-import android.graphics.Color;
 import android.graphics.PixelFormat;
-import android.graphics.Rect;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.view.View;
 import android.widget.RelativeLayout;
 
 import java.util.concurrent.Callable;
diff --git a/tools/android/packaging/xbmc/src/channels/model/Subscription.java.in b/tools/android/packaging/xbmc/src/channels/model/Subscription.java.in
index 0a0c7eb806..00c88807d7 100644
--- a/tools/android/packaging/xbmc/src/channels/model/Subscription.java.in
+++ b/tools/android/packaging/xbmc/src/channels/model/Subscription.java.in
@@ -13,8 +13,6 @@
  */
 package @APP_PACKAGE@.channels.model;
 
-import android.net.Uri;
-
 /**
  * Contains the data about a channel that will be displayed on the launcher.
  */
diff --git a/tools/android/packaging/xbmc/src/channels/model/XBMCDatabase.java.in b/tools/android/packaging/xbmc/src/channels/model/XBMCDatabase.java.in
index 72e18ac4fe..94021e25db 100644
--- a/tools/android/packaging/xbmc/src/channels/model/XBMCDatabase.java.in
+++ b/tools/android/packaging/xbmc/src/channels/model/XBMCDatabase.java.in
@@ -14,8 +14,6 @@
 package @APP_PACKAGE@.channels.model;
 
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.net.Uri;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 
diff --git a/tools/android/packaging/xbmc/src/interfaces/XBMCAudioManagerOnAudioFocusChangeListener.java.in b/tools/android/packaging/xbmc/src/interfaces/XBMCAudioManagerOnAudioFocusChangeListener.java.in
index 3998f20f43..8194fd5a5b 100644
--- a/tools/android/packaging/xbmc/src/interfaces/XBMCAudioManagerOnAudioFocusChangeListener.java.in
+++ b/tools/android/packaging/xbmc/src/interfaces/XBMCAudioManagerOnAudioFocusChangeListener.java.in
@@ -1,7 +1,6 @@
 package @APP_PACKAGE@.interfaces;
 
 import android.media.AudioManager.OnAudioFocusChangeListener;
-import android.util.Log;
 
 public class XBMCAudioManagerOnAudioFocusChangeListener implements OnAudioFocusChangeListener
 {
diff --git a/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerDiscoveryListener.java.in b/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerDiscoveryListener.java.in
index 5e5d96eaa8..f55544d31c 100644
--- a/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerDiscoveryListener.java.in
+++ b/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerDiscoveryListener.java.in
@@ -2,7 +2,6 @@ package @APP_PACKAGE@.interfaces;
 
 import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
-import android.util.Log;
 
 public class XBMCNsdManagerDiscoveryListener implements NsdManager.DiscoveryListener
 {
diff --git a/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerRegistrationListener.java.in b/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerRegistrationListener.java.in
index 7a6f0eb238..5cd9fbd197 100644
--- a/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerRegistrationListener.java.in
+++ b/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerRegistrationListener.java.in
@@ -2,7 +2,6 @@ package @APP_PACKAGE@.interfaces;
 
 import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
-import android.util.Log;
 
 public class XBMCNsdManagerRegistrationListener implements NsdManager.RegistrationListener
 {
diff --git a/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerResolveListener.java.in b/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerResolveListener.java.in
index 4af13c9bd9..4c578a6bcc 100644
--- a/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerResolveListener.java.in
+++ b/tools/android/packaging/xbmc/src/interfaces/XBMCNsdManagerResolveListener.java.in
@@ -2,7 +2,6 @@ package @APP_PACKAGE@.interfaces;
 
 import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
-import android.util.Log;
 
 public class XBMCNsdManagerResolveListener implements NsdManager.ResolveListener
 {
diff --git a/tools/android/packaging/xbmc/src/model/Album.java.in b/tools/android/packaging/xbmc/src/model/Album.java.in
index 8e518ab640..0cf88fdb9f 100644
--- a/tools/android/packaging/xbmc/src/model/Album.java.in
+++ b/tools/android/packaging/xbmc/src/model/Album.java.in
@@ -1,7 +1,5 @@
 package @APP_PACKAGE@.model;
 
-import @APP_PACKAGE@.model.Media;
-
 /**
  * Created by cbro on 22/12/2017
  */
diff --git a/tools/android/packaging/xbmc/src/model/File.java.in b/tools/android/packaging/xbmc/src/model/File.java.in
index 65e8906421..4cfc1bc110 100644
--- a/tools/android/packaging/xbmc/src/model/File.java.in
+++ b/tools/android/packaging/xbmc/src/model/File.java.in
@@ -15,7 +15,6 @@ package @APP_PACKAGE@.model;
  */
 
 import android.database.Cursor;
-import android.net.Uri;
 
 import @APP_PACKAGE@.content.XBMCFileContentProvider;
 
diff --git a/tools/android/packaging/xbmc/src/model/Movie.java.in b/tools/android/packaging/xbmc/src/model/Movie.java.in
index ca510afabc..07dc7f7f39 100644
--- a/tools/android/packaging/xbmc/src/model/Movie.java.in
+++ b/tools/android/packaging/xbmc/src/model/Movie.java.in
@@ -1,7 +1,5 @@
 package @APP_PACKAGE@.model;
 
-import @APP_PACKAGE@.model.Media;
-
 /**
  * Created by cbro on 22/12/2017
  */
diff --git a/tools/android/packaging/xbmc/src/model/TVEpisode.java.in b/tools/android/packaging/xbmc/src/model/TVEpisode.java.in
index 46315b3cf1..ede396836f 100644
--- a/tools/android/packaging/xbmc/src/model/TVEpisode.java.in
+++ b/tools/android/packaging/xbmc/src/model/TVEpisode.java.in
@@ -1,7 +1,5 @@
 package @APP_PACKAGE@.model;
 
-import @APP_PACKAGE@.model.Media;
-
 /**
  * Created by cbro on 22/12/2017
  */
diff --git a/tools/android/packaging/xbmc/src/model/TVShow.java.in b/tools/android/packaging/xbmc/src/model/TVShow.java.in
index 24ed4ce6b9..132a57c10d 100644
--- a/tools/android/packaging/xbmc/src/model/TVShow.java.in
+++ b/tools/android/packaging/xbmc/src/model/TVShow.java.in
@@ -1,7 +1,5 @@
 package @APP_PACKAGE@.model;
 
-import @APP_PACKAGE@.model.Media;
-
 /**
  * Created by cbro on 22/12/2017
  */