From 60574c0db94507542311b7fd6acda886068a2255 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 22 Jul 2014 18:50:20 -0400 Subject: [PATCH] Fixed Video full-screen not working --- src/acr/browser/lightning/LightningView.java | 46 ++++++++++---------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/acr/browser/lightning/LightningView.java b/src/acr/browser/lightning/LightningView.java index f26ac33aa..fa2bceaba 100644 --- a/src/acr/browser/lightning/LightningView.java +++ b/src/acr/browser/lightning/LightningView.java @@ -1005,21 +1005,22 @@ public void onHideCustomView() { @Override public void onShowCustomView(View view, CustomViewCallback callback) { - - if (view instanceof FrameLayout) { - FrameLayout frame = (FrameLayout) view; - if (frame.getFocusedChild() instanceof VideoView) { - VideoView video = (VideoView) frame.getFocusedChild(); - video.stopPlayback(); - frame.removeView(video); - video.setVisibility(View.GONE); - } - } else { + // While these lines might look like they work, in practive, + // Full-screen videos won't work correctly. I may test this out some more + // if (view instanceof FrameLayout) { + // FrameLayout frame = (FrameLayout) view; + // if (frame.getFocusedChild() instanceof VideoView) { + // VideoView video = (VideoView) frame.getFocusedChild(); + // video.stopPlayback(); + // frame.removeView(video); + // video.setVisibility(View.GONE); + // } + // } else { Activity activity = mBrowserController.getActivity(); mBrowserController.onShowCustomView(view, activity.getRequestedOrientation(), callback); - } + // } super.onShowCustomView(view, callback); } @@ -1028,20 +1029,21 @@ public void onShowCustomView(View view, CustomViewCallback callback) { @Deprecated public void onShowCustomView(View view, int requestedOrientation, CustomViewCallback callback) { - - if (view instanceof FrameLayout) { - FrameLayout frame = (FrameLayout) view; - if (frame.getFocusedChild() instanceof VideoView) { - VideoView video = (VideoView) frame.getFocusedChild(); - video.stopPlayback(); - frame.removeView(video); - video.setVisibility(View.GONE); - } - } else { + // While these lines might look like they work, in practive, + // Full-screen videos won't work correctly. I may test this out some more + // if (view instanceof FrameLayout) { + // FrameLayout frame = (FrameLayout) view; + // if (frame.getFocusedChild() instanceof VideoView) { + // VideoView video = (VideoView) frame.getFocusedChild(); + // video.stopPlayback(); + // frame.removeView(video); + // video.setVisibility(View.GONE); + // } + // } else { mBrowserController.onShowCustomView(view, requestedOrientation, callback); - } + // } super.onShowCustomView(view, requestedOrientation, callback); }