Check if controller is used when performing click directly.

Issue:#6260
PiperOrigin-RevId: 261647858
This commit is contained in:
tonihei 2019-08-05 10:43:50 +01:00 committed by Oliver Woodman
parent b0c2b1a0fa
commit 936a7789c9
2 changed files with 6 additions and 3 deletions

View File

@ -24,6 +24,9 @@
([#6192](https://github.com/google/ExoPlayer/issues/6192)). ([#6192](https://github.com/google/ExoPlayer/issues/6192)).
* Fix Flac and ALAC playback on some LG devices * Fix Flac and ALAC playback on some LG devices
([#5938](https://github.com/google/ExoPlayer/issues/5938)). ([#5938](https://github.com/google/ExoPlayer/issues/5938)).
* Fix issue when calling `performClick` on `PlayerView` without
`PlayerControlView`
([#6260](https://github.com/google/ExoPlayer/issues/6260)).
### 2.10.3 ### ### 2.10.3 ###

View File

@ -1156,6 +1156,9 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
// Internal methods. // Internal methods.
private boolean toggleControllerVisibility() { private boolean toggleControllerVisibility() {
if (!useController || player == null) {
return false;
}
if (!controller.isVisible()) { if (!controller.isVisible()) {
maybeShowController(true); maybeShowController(true);
} else if (controllerHideOnTouch) { } else if (controllerHideOnTouch) {
@ -1492,9 +1495,6 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
@Override @Override
public boolean onSingleTapUp(MotionEvent e) { public boolean onSingleTapUp(MotionEvent e) {
if (!useController || player == null) {
return false;
}
return toggleControllerVisibility(); return toggleControllerVisibility();
} }
} }