sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'drhill-dev-v2_subtitles_view' into dev-v2

Browse source
This commit is contained in:
Oliver Woodman 2016-12-02 16:27:36 +00:00
commit 4c427f5b13
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
library/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
View file

@ -472,6 +472,16 @@ public final class SimpleExoPlayerView extends FrameLayout {
return overlayFrameLayout; return overlayFrameLayout;
} }
/**
* Gets the {@link SubtitleView}.
*
* @return The {@link SubtitleView}, or {@code null} if the layout has been customized and the
* subtitle view is not present.
*/
public SubtitleView getSubtitleView() {
return subtitleView;
}
@Override @Override
public boolean onTouchEvent(MotionEvent ev) { public boolean onTouchEvent(MotionEvent ev) {
if (!useController || player == null || ev.getActionMasked() != MotionEvent.ACTION_DOWN) { if (!useController || player == null || ev.getActionMasked() != MotionEvent.ACTION_DOWN) {
@ -494,6 +504,11 @@ public final class SimpleExoPlayerView extends FrameLayout {
return true; return true;
} }
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
return useController ? controller.dispatchKeyEvent(event) : super.dispatchKeyEvent(event);
}
private void maybeShowController(boolean isForced) { private void maybeShowController(boolean isForced) {
if (!useController || player == null) { if (!useController || player == null) {
return; return;