Don't break navigation if player Views other than controls are focused

TeamNewPipe · Apr 11, 2020 · 54ceb85 · 54ceb85
1 parent ef7a5bc
commit 54ceb85
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -234,6 +234,13 @@ public boolean onKeyDown(final int keyCode, final KeyEvent event) {
             case KeyEvent.KEYCODE_DPAD_DOWN:
             case KeyEvent.KEYCODE_DPAD_RIGHT:
             case KeyEvent.KEYCODE_DPAD_CENTER:
+                View playerRoot = playerImpl.getRootView();
+                View controls = playerImpl.getControlsRoot();
+                if (playerRoot.hasFocus() && !controls.hasFocus()) {
+                    // do not interfere with focus in playlist etc.
+                    return super.onKeyDown(keyCode, event);
+                }
+
                 if (playerImpl.getCurrentState() == BasePlayer.STATE_BLOCKED) {
                     return true;
                 }