Fix failing tests on CI machine.

NineWorlds · Sep 8, 2017 · 8e56891 · 8e56891
1 parent 5eeb840
commit 8e56891
Show file tree

Hide file tree

Showing 3 changed files with 480 additions and 621 deletions.
diff --git a/serenity-app/src/main/java/us/nineworlds/serenity/ui/video/player/MediaController.java b/serenity-app/src/main/java/us/nineworlds/serenity/ui/video/player/MediaController.java
@@ -78,7 +78,10 @@
  *
  * DAC - 2014-05-20 - Fix issue on Android 4.3 or higher were mediacontroller
  * window position was not being calculated correctly.
+ *
+ * @deprecated replaced by SimpleExoPlayerView
  */
+@Deprecated
 public class MediaController extends FrameLayout {
 
   private static final int FADE_OUT = 1;

diff --git a/...rc/main/java/us/nineworlds/serenity/ui/video/player/SerenitySurfaceViewVideoActivity.java b/...rc/main/java/us/nineworlds/serenity/ui/video/player/SerenitySurfaceViewVideoActivity.java
@@ -74,7 +74,9 @@
  * or tv show.
  *
  * @author dcarver
+ * @deprecated Use ExoplayerVideoActivity instead
  */
+@Deprecated
 public class SerenitySurfaceViewVideoActivity extends SerenityActivity implements SurfaceHolder.Callback {
 
   @Inject @ForVideoQueue protected LinkedList<VideoContentInfo> videoQueue;