Clean code

ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java

@@ -35,6 +35,8 @@ import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 
+import com.google.common.net.HttpHeaders;
+
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.lang.ref.WeakReference;
@@ -55,7 +57,6 @@ import tv.danmaku.ijk.media.player.misc.IMediaDataSource;
 import tv.danmaku.ijk.media.player.misc.ITrackInfo;
 import tv.danmaku.ijk.media.player.misc.IjkTrackInfo;
 import tv.danmaku.ijk.media.player.pragma.DebugLog;
-import tv.danmaku.ijk.media.player.ui.Util;
 
 /**
  * @author bbcallen
@@ -350,7 +351,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer {
      * @throws IllegalStateException if it is called in an invalid state
      */
     public void setDataSource(String path, Map<String, String> headers) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
-        for (String key : Arrays.asList(Util.USER_AGENT, Util.USER_AGENT.toLowerCase())) {
+        for (String key : Arrays.asList(HttpHeaders.USER_AGENT, HttpHeaders.USER_AGENT.toLowerCase())) {
             if (!headers.containsKey(key)) continue;
             setOption(OPT_CATEGORY_FORMAT, "user_agent", headers.get(key));
             headers.remove(key);

ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/Util.java

@@ -1,18 +0,0 @@
-package tv.danmaku.ijk.media.player.ui;
-
-import android.content.Context;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-
-public class Util {
-
-    public static final String USER_AGENT = "User-Agent";
-
-    public static float dp2px(Context context, float dp) {
-        return (dp * context.getResources().getDisplayMetrics().densityDpi) / DisplayMetrics.DENSITY_DEFAULT;
-    }
-
-    public static float sp2px(Context context, float sp) {
-        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, context.getResources().getDisplayMetrics());
-    }
-}