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 d6e74bc19b
commit 790deb71db
2 changed files with 6 additions and 3 deletions

View file

@ -27,6 +27,9 @@
over other selection parameters. over other selection parameters.
* Remove `AnalyticsCollector.Factory`. Instances can be created directly and * Remove `AnalyticsCollector.Factory`. Instances can be created directly and
the `Player` set later using `AnalyticsCollector.setPlayer`. the `Player` set later using `AnalyticsCollector.setPlayer`.
* Fix issue when calling `performClick` on `PlayerView` without
`PlayerControlView`
([#6260](https://github.com/google/ExoPlayer/issues/6260)).
### 2.10.4 ### ### 2.10.4 ###

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) {
@ -1491,9 +1494,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();
} }
} }