Merge pull request #11421 from t895/disable-header-focus

Android: Disable focus on non-actionable UI
dolphin-emu · Jan 9, 2023 · acafb07 · acafb07
2 parents 653e0cc + f49f344
commit acafb07
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 1 deletion.
diff --git a/Source/Android/app/src/main/res/layout-land/activity_user_data.xml b/Source/Android/app/src/main/res/layout-land/activity_user_data.xml
@@ -150,6 +150,7 @@
         android:layout_height="0dp"
         android:layout_gravity="bottom"
         android:clickable="true"
+        android:focusable="false"
         android:background="@android:color/transparent" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml b/Source/Android/app/src/main/res/layout-w680dp-land/activity_convert.xml
@@ -89,6 +89,7 @@
         android:layout_height="0dp"
         android:layout_gravity="bottom"
         android:clickable="true"
+        android:focusable="false"
         android:background="@android:color/transparent" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Source/Android/app/src/main/res/layout/activity_cheats.xml b/Source/Android/app/src/main/res/layout/activity_cheats.xml
@@ -69,6 +69,7 @@
         android:layout_gravity="bottom"
         android:background="@android:color/transparent"
         android:clickable="true"
+        android:focusable="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

diff --git a/Source/Android/app/src/main/res/layout/activity_convert.xml b/Source/Android/app/src/main/res/layout/activity_convert.xml
@@ -87,6 +87,7 @@
         android:layout_height="0dp"
         android:layout_gravity="bottom"
         android:clickable="true"
+        android:focusable="false"
         android:background="@android:color/transparent" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Source/Android/app/src/main/res/layout/activity_main.xml b/Source/Android/app/src/main/res/layout/activity_main.xml
@@ -48,6 +48,7 @@
         android:layout_height="0dp"
         android:layout_gravity="bottom"
         android:clickable="true"
+        android:focusable="false"
         android:background="@android:color/transparent" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton

diff --git a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
@@ -104,6 +104,7 @@
         android:layout_height="0dp"
         android:layout_gravity="bottom"
         android:clickable="true"
+        android:focusable="false"
         android:background="@android:color/transparent" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Source/Android/app/src/main/res/layout/activity_settings.xml b/Source/Android/app/src/main/res/layout/activity_settings.xml
@@ -45,6 +45,7 @@
         android:layout_height="0dp"
         android:layout_gravity="bottom"
         android:clickable="true"
+        android:focusable="false"
         android:background="@android:color/transparent" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Source/Android/app/src/main/res/layout/activity_user_data.xml b/Source/Android/app/src/main/res/layout/activity_user_data.xml
@@ -127,6 +127,7 @@
         android:layout_height="0dp"
         android:layout_gravity="bottom"
         android:clickable="true"
+        android:focusable="false"
         android:background="@android:color/transparent" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Source/Android/app/src/main/res/layout/list_item_header.xml b/Source/Android/app/src/main/res/layout/list_item_header.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:focusable="true"
+    android:focusable="false"
     android:layout_height="wrap_content">
 
     <TextView