diff --git a/android/native/jni/input_autodetect.c b/android/native/jni/input_autodetect.c
index fd987d5791..7baede6681 100644
--- a/android/native/jni/input_autodetect.c
+++ b/android/native/jni/input_autodetect.c
@@ -302,6 +302,40 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
             keycode_lut[AKEYCODE_BUTTON_R1]  |=  ((RETRO_DEVICE_ID_JOYPAD_R2+1)     << shift);
          }
       }
+      else if (strstr(name_buf, "Sun4i-keypad"))
+      {
+         // iDroid x360
+         g_settings.input.dpad_emulation[port] = DPAD_EMULATION_NONE;
+         keycode_lut[AKEYCODE_DPAD_UP] |=  ((RETRO_DEVICE_ID_JOYPAD_UP+1)      << shift);
+         keycode_lut[AKEYCODE_DPAD_DOWN] |=  ((RETRO_DEVICE_ID_JOYPAD_DOWN+1)      << shift);
+         keycode_lut[AKEYCODE_DPAD_LEFT] |=  ((RETRO_DEVICE_ID_JOYPAD_LEFT+1)      << shift);
+         keycode_lut[AKEYCODE_DPAD_RIGHT] |=  ((RETRO_DEVICE_ID_JOYPAD_RIGHT+1)      << shift);
+         keycode_lut[AKEYCODE_INSERT] |=  ((RETRO_DEVICE_ID_JOYPAD_B+1)      << shift);
+         keycode_lut[AKEYCODE_MINUS] |=  ((RETRO_DEVICE_ID_JOYPAD_A+1)      << shift);
+         keycode_lut[AKEYCODE_SLASH] |=  ((RETRO_DEVICE_ID_JOYPAD_X+1)      << shift);
+         keycode_lut[AKEYCODE_MOVE_END] |=  ((RETRO_DEVICE_ID_JOYPAD_Y+1)      << shift);
+         keycode_lut[AKEYCODE_LEFT_BRACKET] |=  ((RETRO_DEVICE_ID_JOYPAD_L+1)      << shift);
+         keycode_lut[AKEYCODE_FORWARD_DEL] |=  ((RETRO_DEVICE_ID_JOYPAD_R+1)      << shift);
+         keycode_lut[AKEYCODE_MEDIA_PLAY] |=  ((RETRO_DEVICE_ID_JOYPAD_START+1)      << shift);
+         keycode_lut[AKEYCODE_EQUALS] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
+
+         // use this for the RGUI toggle
+         //keycode_lut[AKEYCODE_MENU] |=  ((RETRO_DEVICE_ID_JOYPAD_START+1)      << shift);
+
+         // Left Analog Up: 152
+         // Left Analog Down: 146
+         // Left Analog Right: 150
+         // Left Analog Left: 148
+         // Right Analog Up: 92 (AKEYCODE_PAGE_UP)
+         // Right Analog Down: 93 (AKEYCODE_PAGE_DOWN)
+         // Right Analog Right: 113 (AKEYCODE_CTRL_LEFT)
+         // Right Analog Left: 72 (AKEYCODE_RIGHT_BRACKET)
+         keycode_lut[AKEYCODE_NUMPAD_8] |=  ((RETRO_DEVICE_ID_JOYPAD_UP+1)      << shift);
+         keycode_lut[AKEYCODE_NUMPAD_2] |=  ((RETRO_DEVICE_ID_JOYPAD_DOWN+1)      << shift);
+         keycode_lut[AKEYCODE_NUMPAD_6] |=  ((RETRO_DEVICE_ID_JOYPAD_RIGHT+1)      << shift);
+         keycode_lut[AKEYCODE_NUMPAD_4] |=  ((RETRO_DEVICE_ID_JOYPAD_LEFT+1)      << shift);
+
+      }
       else if (strstr(name_buf, "Zeemote"))
       {
          if (strstr(name_buf, "Steelseries free"))
@@ -458,6 +492,8 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
          }
          else
          {
+            //PS button will be used for RGUI toggle
+            //keycode_lut[AKEYCODE_BUTTON_1] |= ((RETRO_DEVICE_ID_JOYPAD_B+1)     << shift);
             keycode_lut[AKEYCODE_BUTTON_X] |=  ((RETRO_DEVICE_ID_JOYPAD_B+1)      << shift);
             keycode_lut[AKEYCODE_BUTTON_A] |=  ((RETRO_DEVICE_ID_JOYPAD_Y+1)      << shift);
          }
diff --git a/android/native/jni/input_autodetect.h b/android/native/jni/input_autodetect.h
index 5ca7a3cb43..4619106678 100644
--- a/android/native/jni/input_autodetect.h
+++ b/android/native/jni/input_autodetect.h
@@ -29,11 +29,17 @@ enum {
 enum {
    AKEYCODE_META_FUNCTION_ON = 8,
    AKEYCODE_ESCAPE          = 111,
+   AKEYCODE_FORWARD_DEL     = 112,
+   AKEYCODE_CTRL_LEFT       = 113,
+   AKEYCODE_CTRL_RIGHT      = 114,
    AKEYCODE_CAPS_LOCK       = 115,
    AKEYCODE_SCROLL_LOCK     = 116,
    AKEYCODE_SYSRQ           = 120,
    AKEYCODE_BREAK           = 121,
    AKEYCODE_MOVE_HOME       = 122,
+   AKEYCODE_MOVE_END        = 123,
+   AKEYCODE_INSERT          = 124,
+   AKEYCODE_FORWARD         = 125,
    AKEYCODE_MEDIA_PLAY      = 126,
    AKEYCODE_MEDIA_PAUSE     = 127,
    AKEYCODE_F2              = 132,
@@ -44,6 +50,15 @@ enum {
    AKEYCODE_F7              = 137,
    AKEYCODE_F8              = 138,
    AKEYCODE_F9              = 139,
+   AKEYCODE_NUMPAD_1        = 145,
+   AKEYCODE_NUMPAD_2        = 146,
+   AKEYCODE_NUMPAD_3        = 147,
+   AKEYCODE_NUMPAD_4        = 148,
+   AKEYCODE_NUMPAD_5        = 149,
+   AKEYCODE_NUMPAD_6        = 150,
+   AKEYCODE_NUMPAD_7        = 151,
+   AKEYCODE_NUMPAD_8        = 152,
+   AKEYCODE_NUMPAD_9        = 153,
    AKEYCODE_BUTTON_1        = 188,
    AKEYCODE_BUTTON_2        = 189,
    AKEYCODE_BUTTON_3        = 190,