Commit 8887725c authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Move Util classes to org.videolan.vlc.util

parent 32e05f1c
......@@ -207,7 +207,7 @@ public class Media implements Comparable<Media> {
* hard-coded dependency gracefully for 3rd party libvlc apps while still
* maintaining good l10n in VLC for Android.
*
* @see org.videolan.vlc.Util#getValue(String, int)
* @see org.videolan.vlc.util.Util#getValue(String, int)
*
* @param string The default string
* @param type Alias for R.string.xxx
......@@ -326,7 +326,7 @@ public class Media implements Comparable<Media> {
* Returns the raw picture object. Likely to be NULL in VLC for Android
* due to lazy-loading.
*
* Use {@link org.videolan.vlc.Util#getPictureFromCache(Media)} instead.
* Use {@link org.videolan.vlc.util.Util#getPictureFromCache(Media)} instead.
*
* @return The raw picture or NULL
*/
......@@ -337,7 +337,7 @@ public class Media implements Comparable<Media> {
/**
* Sets the raw picture object.
*
* In VLC for Android, use {@link org.videolan.vlc.Util#setPicture(Context, Media, Bitmap)} instead.
* In VLC for Android, use {@link org.videolan.vlc.util.Util#setPicture(Context, Media, Bitmap)} instead.
*
* @param p
*/
......
......@@ -48,6 +48,8 @@ import org.videolan.vlc.gui.audio.AudioUtil;
import org.videolan.vlc.gui.video.VideoPlayerActivity;
import org.videolan.vlc.interfaces.IAudioService;
import org.videolan.vlc.interfaces.IAudioServiceCallback;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.util.WeakHandler;
import android.annotation.TargetApi;
import android.app.Notification;
......
......@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.videolan.libvlc.Media;
import org.videolan.vlc.util.Util;
public class MediaGroup extends Media {
......
......@@ -39,6 +39,8 @@ import org.videolan.libvlc.Media;
import org.videolan.vlc.gui.MainActivity;
import org.videolan.vlc.gui.audio.AudioBrowserFragment;
import org.videolan.vlc.gui.video.VideoGridFragment;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.util.WeakHandler;
import android.content.Context;
import android.os.Environment;
......
......@@ -21,6 +21,7 @@ package org.videolan.vlc;
import org.videolan.libvlc.LibVLC;
import org.videolan.libvlc.LibVlcException;
import org.videolan.vlc.util.Util;
import android.content.BroadcastReceiver;
import android.content.Context;
......
......@@ -34,6 +34,7 @@ import org.videolan.libvlc.LibVlcException;
import org.videolan.libvlc.Media;
import org.videolan.vlc.gui.MainActivity;
import org.videolan.vlc.gui.video.VideoGridFragment;
import org.videolan.vlc.util.Util;
import android.content.Context;
import android.graphics.Bitmap;
......
......@@ -22,6 +22,7 @@ package org.videolan.vlc;
import java.util.Locale;
import org.videolan.vlc.gui.audio.AudioUtil;
import org.videolan.vlc.util.BitmapCache;
import android.app.Application;
import android.content.Context;
......
......@@ -29,6 +29,8 @@ import java.io.StringWriter;
import java.io.Writer;
import java.lang.Thread.UncaughtExceptionHandler;
import org.videolan.vlc.util.Util;
import android.os.Environment;
import android.text.format.DateFormat;
import android.util.Log;
......
......@@ -21,7 +21,7 @@
package org.videolan.vlc.gui;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.widget.FlingViewGroup;
import android.content.Context;
......
......@@ -30,7 +30,7 @@ import java.util.Stack;
import org.videolan.libvlc.Media;
import org.videolan.vlc.MediaDatabase;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.util.Util;
import android.app.AlertDialog;
import android.app.ListActivity;
......
......@@ -25,9 +25,9 @@ import java.net.URI;
import java.net.URISyntaxException;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.VlcRunnable;
import org.videolan.vlc.interfaces.OnExpandableListener;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.widget.ExpandableLayout;
import android.app.Activity;
......
......@@ -23,7 +23,7 @@ package org.videolan.vlc.gui;
import org.videolan.libvlc.LibVLC;
import org.videolan.libvlc.LibVlcException;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.util.Util;
import android.app.Activity;
import android.os.Bundle;
......
......@@ -31,8 +31,8 @@ import java.util.regex.Pattern;
import org.videolan.libvlc.LibVLC;
import org.videolan.libvlc.Media;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.VLCApplication;
import org.videolan.vlc.util.Util;
import android.content.Context;
import android.os.Build;
......
......@@ -26,10 +26,10 @@ import java.util.List;
import org.videolan.libvlc.LibVLC;
import org.videolan.vlc.AudioServiceController;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.VlcRunnable;
import org.videolan.vlc.gui.video.VideoPlayerActivity;
import org.videolan.vlc.interfaces.ISortable;
import org.videolan.vlc.util.Util;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
......
......@@ -26,8 +26,8 @@ import org.videolan.libvlc.LibVlcException;
import org.videolan.libvlc.Media;
import org.videolan.vlc.R;
import org.videolan.vlc.VLCApplication;
import org.videolan.vlc.WeakHandler;
import org.videolan.vlc.gui.audio.AudioUtil;
import org.videolan.vlc.util.WeakHandler;
import android.content.Context;
import android.graphics.Bitmap;
......
......@@ -31,10 +31,8 @@ import org.videolan.vlc.AudioServiceController;
import org.videolan.vlc.MediaDatabase;
import org.videolan.vlc.MediaLibrary;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.VLCApplication;
import org.videolan.vlc.VLCCallbackTask;
import org.videolan.vlc.WeakHandler;
import org.videolan.vlc.gui.SidebarAdapter.SidebarEntry;
import org.videolan.vlc.gui.audio.AudioAlbumsSongsFragment;
import org.videolan.vlc.gui.audio.AudioPlayer;
......@@ -43,6 +41,8 @@ import org.videolan.vlc.gui.video.MediaInfoFragment;
import org.videolan.vlc.gui.video.VideoGridFragment;
import org.videolan.vlc.gui.video.VideoListAdapter;
import org.videolan.vlc.interfaces.ISortable;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.util.WeakHandler;
import org.videolan.vlc.widget.SlidingPaneLayout;
import android.annotation.TargetApi;
......
......@@ -10,7 +10,7 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.util.Util;
import android.app.Activity;
import android.app.ProgressDialog;
......
......@@ -24,12 +24,12 @@ import org.videolan.libvlc.LibVLC;
import org.videolan.libvlc.LibVlcUtil;
import org.videolan.vlc.AudioService;
import org.videolan.vlc.AudioServiceController;
import org.videolan.vlc.BitmapCache;
import org.videolan.vlc.MediaDatabase;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.VLCApplication;
import org.videolan.vlc.gui.audio.AudioUtil;
import org.videolan.vlc.util.BitmapCache;
import org.videolan.vlc.util.Util;
import android.app.AlertDialog;
import android.content.Context;
......
......@@ -25,10 +25,10 @@ import java.util.HashMap;
import java.util.List;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.VLCApplication;
import org.videolan.vlc.gui.audio.AudioBrowserFragment;
import org.videolan.vlc.gui.video.VideoGridFragment;
import org.videolan.vlc.util.Util;
import android.content.Context;
import android.graphics.Typeface;
......
......@@ -29,10 +29,10 @@ import org.videolan.libvlc.Media;
import org.videolan.vlc.AudioServiceController;
import org.videolan.vlc.MediaLibrary;
import org.videolan.vlc.R;
import org.videolan.vlc.Util;
import org.videolan.vlc.VlcRunnable;
import org.videolan.vlc.gui.CommonDialogs;
import org.videolan.vlc.gui.MainActivity;
import org.videolan.vlc.util.Util;
import org.videolan.vlc.widget.FlingViewGroup;
import android.annotation.TargetApi;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment