android: Allow controller to focus on toolbar menu items

Workaround for this https://issuetracker.google.com/issues/256948272
3 years ago · d04853839d
11 changed files with 28 additions and 6 deletions
--- a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml
+++ b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml
@ -11,12 +11,14 @@
        android:id="@+id/appbar_about"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        android:touchscreenBlocksFocus="false">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar_about"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
+            android:touchscreenBlocksFocus="false"
            app:navigationIcon="@drawable/ic_back"
            app:title="@string/about" />

--- a/src/android/app/src/main/res/layout/fragment_about.xml
+++ b/src/android/app/src/main/res/layout/fragment_about.xml
@ -11,12 +11,14 @@
        android:id="@+id/appbar_about"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        android:touchscreenBlocksFocus="false">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar_about"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
+            android:touchscreenBlocksFocus="false"
            app:title="@string/about"
            app:navigationIcon="@drawable/ic_back" />

--- a/src/android/app/src/main/res/layout/fragment_addons.xml
+++ b/src/android/app/src/main/res/layout/fragment_addons.xml
@ -11,6 +11,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:fitsSystemWindows="true"
+        android:touchscreenBlocksFocus="false"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
@ -19,6 +20,7 @@
            android:id="@+id/toolbar_addons"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
+            android:touchscreenBlocksFocus="false"
            app:navigationIcon="@drawable/ic_back" />

    </com.google.android.material.appbar.AppBarLayout>
--- a/src/android/app/src/main/res/layout/fragment_applet_launcher.xml
+++ b/src/android/app/src/main/res/layout/fragment_applet_launcher.xml
@ -10,12 +10,14 @@
        android:id="@+id/appbar_applets"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        android:touchscreenBlocksFocus="false">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar_applets"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
+            android:touchscreenBlocksFocus="false"
            app:navigationIcon="@drawable/ic_back"
            app:title="@string/applets" />

--- a/src/android/app/src/main/res/layout/fragment_driver_manager.xml
+++ b/src/android/app/src/main/res/layout/fragment_driver_manager.xml
@ -15,12 +15,14 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:fitsSystemWindows="true"
+            android:touchscreenBlocksFocus="false"
            app:liftOnScrollTargetViewId="@id/list_drivers">

            <com.google.android.material.appbar.MaterialToolbar
                android:id="@+id/toolbar_drivers"
                android:layout_width="match_parent"
                android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                app:navigationIcon="@drawable/ic_back"
                app:title="@string/gpu_driver_manager" />

--- a/src/android/app/src/main/res/layout/fragment_early_access.xml
+++ b/src/android/app/src/main/res/layout/fragment_early_access.xml
@ -11,12 +11,14 @@
        android:id="@+id/appbar_ea"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        android:touchscreenBlocksFocus="false">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar_about"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
+            android:touchscreenBlocksFocus="false"
            app:navigationIcon="@drawable/ic_back"
            app:title="@string/early_access" />

--- a/src/android/app/src/main/res/layout/fragment_folders.xml
+++ b/src/android/app/src/main/res/layout/fragment_folders.xml
@ -15,12 +15,14 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:fitsSystemWindows="true"
+            android:touchscreenBlocksFocus="false"
            app:liftOnScrollTargetViewId="@id/list_folders">

            <com.google.android.material.appbar.MaterialToolbar
                android:id="@+id/toolbar_folders"
                android:layout_width="match_parent"
                android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                app:navigationIcon="@drawable/ic_back"
                app:title="@string/game_folders" />

--- a/src/android/app/src/main/res/layout/fragment_game_info.xml
+++ b/src/android/app/src/main/res/layout/fragment_game_info.xml
@ -11,12 +11,14 @@
        android:id="@+id/appbar_info"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:touchscreenBlocksFocus="false"
        android:fitsSystemWindows="true">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar_info"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
+            android:touchscreenBlocksFocus="false"
            app:navigationIcon="@drawable/ic_back" />

    </com.google.android.material.appbar.AppBarLayout>
--- a/src/android/app/src/main/res/layout/fragment_installables.xml
+++ b/src/android/app/src/main/res/layout/fragment_installables.xml
@ -10,12 +10,14 @@
        android:id="@+id/appbar_installables"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        android:touchscreenBlocksFocus="false">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar_installables"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
+            android:touchscreenBlocksFocus="false"
            app:title="@string/manage_yuzu_data"
            app:navigationIcon="@drawable/ic_back" />

--- a/src/android/app/src/main/res/layout/fragment_licenses.xml
+++ b/src/android/app/src/main/res/layout/fragment_licenses.xml
@ -10,12 +10,14 @@
        android:id="@+id/appbar_licenses"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:fitsSystemWindows="true"
+        android:touchscreenBlocksFocus="false">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar_licenses"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
+            android:touchscreenBlocksFocus="false"
            app:title="@string/licenses"
            app:navigationIcon="@drawable/ic_back" />

--- a/src/android/app/src/main/res/layout/fragment_settings.xml
+++ b/src/android/app/src/main/res/layout/fragment_settings.xml
@ -11,6 +11,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:fitsSystemWindows="true"
+        android:touchscreenBlocksFocus="false"
        app:elevation="0dp">

        <com.google.android.material.appbar.CollapsingToolbarLayout
@ -24,6 +25,7 @@
                android:id="@+id/toolbar_settings"
                android:layout_width="match_parent"
                android:layout_height="?attr/actionBarSize"
+                android:touchscreenBlocksFocus="false"
                app:layout_collapseMode="pin"
                app:navigationIcon="@drawable/ic_back" />