Merge branch 'master' into release

Swordfish90 · Mar 21, 2022 · 893f5dc · 893f5dc
2 parents 495c555 + 2f188bc
commit 893f5dc
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/input/InputClassGamePad.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/input/InputClassGamePad.kt
@@ -13,17 +13,11 @@ object InputClassGamePad : InputClass {
         KeyEvent.KEYCODE_BUTTON_B,
         KeyEvent.KEYCODE_BUTTON_X,
         KeyEvent.KEYCODE_BUTTON_Y,
+        KeyEvent.KEYCODE_BUTTON_START,
+        KeyEvent.KEYCODE_BUTTON_SELECT,
     )
 
     private val INPUT_KEYS = listOf(
-        KeyEvent.KEYCODE_DPAD_UP,
-        KeyEvent.KEYCODE_DPAD_DOWN,
-        KeyEvent.KEYCODE_DPAD_RIGHT,
-        KeyEvent.KEYCODE_DPAD_LEFT,
-        KeyEvent.KEYCODE_DPAD_UP_LEFT,
-        KeyEvent.KEYCODE_DPAD_UP_RIGHT,
-        KeyEvent.KEYCODE_DPAD_DOWN_LEFT,
-        KeyEvent.KEYCODE_DPAD_DOWN_RIGHT,
         KeyEvent.KEYCODE_BUTTON_A,
         KeyEvent.KEYCODE_BUTTON_B,
         KeyEvent.KEYCODE_BUTTON_X,