From 27554d2f265289b5f4c7ca0235377b9bdba92a9a Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Wed, 29 Jul 2020 17:29:15 +0200
Subject: [PATCH] Android: Remove inappropriate leanback checks

Android TV devices aren't the only devices without touchscreens.

Regarding MotionAlertDialog, I could've replaced the leanback
check with a touchscreen check instead of just removing it,
but I thought there was no reason to prevent people with
touchscreens from doing a long back press if they want to.
---
 .../dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java   | 5 ++---
 .../fragment_emulation.xml                                 | 0
 .../main/res/layout-port-notouch/fragment_emulation.xml    | 7 +++++++
 3 files changed, 9 insertions(+), 3 deletions(-)
 rename Source/Android/app/src/main/res/{layout-television => layout-notouch}/fragment_emulation.xml (100%)
 create mode 100644 Source/Android/app/src/main/res/layout-port-notouch/fragment_emulation.xml

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
index 39140c4829..6b633e9aec 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
@@ -12,7 +12,6 @@ import org.dolphinemu.dolphinemu.features.settings.model.view.InputBindingSettin
 import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter;
 import org.dolphinemu.dolphinemu.utils.ControllerMappingHelper;
 import org.dolphinemu.dolphinemu.utils.Log;
-import org.dolphinemu.dolphinemu.utils.TvUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,8 +62,8 @@ public final class MotionAlertDialog extends AlertDialog
   @Override
   public boolean onKeyLongPress(int keyCode, @NonNull KeyEvent event)
   {
-    // Option to clear by long back is only needed on the TV interface
-    if (TvUtil.isLeanback(getContext()) && keyCode == KeyEvent.KEYCODE_BACK)
+    // Intended for devices with no touchscreen or mouse
+    if (keyCode == KeyEvent.KEYCODE_BACK)
     {
       setting.clearValue(mAdapter.getSettings());
       dismiss();
diff --git a/Source/Android/app/src/main/res/layout-television/fragment_emulation.xml b/Source/Android/app/src/main/res/layout-notouch/fragment_emulation.xml
similarity index 100%
rename from Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
rename to Source/Android/app/src/main/res/layout-notouch/fragment_emulation.xml
diff --git a/Source/Android/app/src/main/res/layout-port-notouch/fragment_emulation.xml b/Source/Android/app/src/main/res/layout-port-notouch/fragment_emulation.xml
new file mode 100644
index 0000000000..1766a2c8e6
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout-port-notouch/fragment_emulation.xml
@@ -0,0 +1,7 @@
+<SurfaceView xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/surface_emulation"
+             android:layout_height="match_parent"
+             android:layout_width="match_parent"
+             android:focusable="false"
+             android:focusableInTouchMode="false"
+    />
\ No newline at end of file