2 files changed, 46 insertions, 0 deletions

diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h
index e240a0989e..e3de03f222 100644
--- a/apps/plugins/lib/keymaps.h
+++ b/apps/plugins/lib/keymaps.h
@@ -223,6 +223,22 @@
 #define BTN_FIRE         BUTTON_PLAY
 #define BTN_PAUSE        BUTTON_POWER
 
+#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD)
+#define BTN_UP           BUTTON_VOL_UP
+#define BTN_DOWN         BUTTON_VOL_DOWN
+#define BTN_LEFT         BUTTON_PREV
+#define BTN_RIGHT        BUTTON_NEXT
+#define BTN_FIRE         BUTTON_PLAY
+#define BTN_PAUSE        BUTTON_POWER
+
+#elif (CONFIG_KEYPAD == XDUOO_X20_PAD)
+#define BTN_UP           BUTTON_VOL_UP
+#define BTN_DOWN         BUTTON_VOL_DOWN
+#define BTN_LEFT         BUTTON_PREV
+#define BTN_RIGHT        BUTTON_NEXT
+#define BTN_FIRE         BUTTON_PLAY
+#define BTN_PAUSE        BUTTON_POWER
+
 #elif (CONFIG_KEYPAD == IHIFI_770_PAD)
 #define BTN_UP           BUTTON_PREV
 #define BTN_DOWN         BUTTON_NEXT
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 97b5a1e1bf..0834e020f4 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -237,6 +237,24 @@ const struct button_mapping pla_main_ctx[] =
     { PLA_DOWN_REPEAT,      BUTTON_OPTION|BUTTON_REPEAT,        BUTTON_NONE },
     { PLA_LEFT_REPEAT,      BUTTON_PREV|BUTTON_REPEAT,          BUTTON_NONE },
     { PLA_RIGHT_REPEAT,     BUTTON_NEXT|BUTTON_REPEAT,          BUTTON_NONE },
+#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD)
+    { PLA_UP,               BUTTON_HOME,                        BUTTON_NONE },
+    { PLA_DOWN,             BUTTON_OPTION,                      BUTTON_NONE },
+    { PLA_LEFT,             BUTTON_PREV,                        BUTTON_NONE },
+    { PLA_RIGHT,            BUTTON_NEXT,                        BUTTON_NONE },
+    { PLA_UP_REPEAT,        BUTTON_HOME|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_DOWN_REPEAT,      BUTTON_OPTION|BUTTON_REPEAT,        BUTTON_NONE },
+    { PLA_LEFT_REPEAT,      BUTTON_PREV|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_RIGHT_REPEAT,     BUTTON_NEXT|BUTTON_REPEAT,          BUTTON_NONE },
+#elif (CONFIG_KEYPAD == XDUOO_X20_PAD)
+    { PLA_UP,               BUTTON_HOME,                        BUTTON_NONE },
+    { PLA_DOWN,             BUTTON_OPTION,                      BUTTON_NONE },
+    { PLA_LEFT,             BUTTON_PREV,                        BUTTON_NONE },
+    { PLA_RIGHT,            BUTTON_NEXT,                        BUTTON_NONE },
+    { PLA_UP_REPEAT,        BUTTON_HOME|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_DOWN_REPEAT,      BUTTON_OPTION|BUTTON_REPEAT,        BUTTON_NONE },
+    { PLA_LEFT_REPEAT,      BUTTON_PREV|BUTTON_REPEAT,          BUTTON_NONE },
+    { PLA_RIGHT_REPEAT,     BUTTON_NEXT|BUTTON_REPEAT,          BUTTON_NONE },
 #elif (CONFIG_KEYPAD == IHIFI_770_PAD)
     { PLA_UP,               BUTTON_PREV,                        BUTTON_NONE },
     { PLA_DOWN,             BUTTON_NEXT,                        BUTTON_NONE },
@@ -480,6 +498,18 @@ const struct button_mapping pla_main_ctx[] =
     {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
     {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
     {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
+#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD)
+    {PLA_CANCEL,            BUTTON_POWER|BUTTON_REL,            BUTTON_POWER},
+    {PLA_EXIT,              BUTTON_POWER|BUTTON_REPEAT,         BUTTON_NONE},
+    {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
+    {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
+    {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
+#elif (CONFIG_KEYPAD == XDUOO_X20_PAD)
+    {PLA_CANCEL,            BUTTON_POWER|BUTTON_REL,            BUTTON_POWER},
+    {PLA_EXIT,              BUTTON_POWER|BUTTON_REPEAT,         BUTTON_NONE},
+    {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
+    {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
+    {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
 #elif (CONFIG_KEYPAD == IHIFI_770_PAD)
     {PLA_CANCEL,            BUTTON_POWER|BUTTON_REL,            BUTTON_POWER},
     {PLA_EXIT,              BUTTON_POWER|BUTTON_REPEAT,         BUTTON_NONE},