From 7db1ba40ebf530181984c99804b1ab6d392a1742 Mon Sep 17 00:00:00 2001
From: Alexander <eltex.developers@gmail.com>
Date: Fri, 20 Sep 2019 16:48:34 +0700
Subject: [PATCH] Do not allow focus to escape from open DrawerLayout

Upstream DrawerLayout does override addFocusables, but
incorrectly checks for isDrawerOpen instread of isDrawerVisible
---
 .../newpipe/views/FocusAwareDrawerLayout.java | 69 +++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     |  4 +-
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/views/FocusAwareDrawerLayout.java

diff --git a/app/src/main/java/org/schabi/newpipe/views/FocusAwareDrawerLayout.java b/app/src/main/java/org/schabi/newpipe/views/FocusAwareDrawerLayout.java
new file mode 100644
index 000000000..0e8097dbe
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/views/FocusAwareDrawerLayout.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) Eltex ltd 2019 <eltex@eltex-co.ru>
+ * FocusAwareDrawerLayout.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.schabi.newpipe.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+
+import java.util.ArrayList;
+
+public final class FocusAwareDrawerLayout extends DrawerLayout {
+    public FocusAwareDrawerLayout(@NonNull Context context) {
+        super(context);
+    }
+
+    public FocusAwareDrawerLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public FocusAwareDrawerLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public void addFocusables(ArrayList<View> views, int direction, int focusableMode) {
+        boolean hasOpenPanels = false;
+        View content = null;
+
+        for (int i = 0; i < getChildCount(); ++i) {
+            View child = getChildAt(i);
+
+            DrawerLayout.LayoutParams lp = (DrawerLayout.LayoutParams) child.getLayoutParams();
+
+            if (lp.gravity == 0) {
+                content = child;
+            } else {
+                if (isDrawerVisible(child)) {
+                    hasOpenPanels = true;
+                    child.addFocusables(views, direction, focusableMode);
+                }
+            }
+        }
+
+        if (content != null && !hasOpenPanels) {
+            content.addFocusables(views, direction, focusableMode);
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 92e73234f..a965f5f65 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
+<org.schabi.newpipe.views.FocusAwareDrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -24,4 +24,4 @@
 
     <include layout="@layout/drawer_layout"/>
 
-</androidx.drawerlayout.widget.DrawerLayout>
+</org.schabi.newpipe.views.FocusAwareDrawerLayout>