diff -Naur ./rockbox.unmod/apps/plugins/blackjack.c ./rockbox.mod/apps/plugins/blackjack.c
--- ./rockbox.unmod/apps/plugins/blackjack.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/blackjack.c	2011-01-22 20:40:08.000000000 -0600
@@ -450,6 +450,21 @@
 #define BJACK_RIGHT         BUTTON_FF
 #define BJACK_LEFT          BUTTON_REW
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define BJACK_SELECT_NAME   "CENTER"
+#define BJACK_STAY_NAME     "RIGHT"
+#define BJACK_QUIT_NAME     "BACK"
+#define BJACK_DOUBLE_NAME   "UP"
+#define BJACK_SELECT        BUTTON_DPAD_CENTER
+#define BJACK_QUIT          BUTTON_BACK
+#define BJACK_STAY          (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define BJACK_DOUBLEDOWN    (BUTTON_DPAD_UP | BUTTON_REL)
+#define BJACK_UP            (BUTTON_DPAD_UP | BUTTON_REL)
+#define BJACK_DOWN          (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define BJACK_RIGHT         (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define BJACK_LEFT          (BUTTON_DPAD_LEFT | BUTTON_REL)
+
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/bounce.c ./rockbox.mod/apps/plugins/bounce.c
--- ./rockbox.unmod/apps/plugins/bounce.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/bounce.c	2011-01-22 20:40:51.000000000 -0600
@@ -228,6 +228,15 @@
 #define BOUNCE_QUIT (BUTTON_REC | BUTTON_REPEAT)
 #define BOUNCE_MODE BUTTON_MENU
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define BOUNCE_LEFT  (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define BOUNCE_RIGHT (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define BOUNCE_UP    (BUTTON_DPAD_UP | BUTTON_REL)
+#define BOUNCE_DOWN  (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define BOUNCE_QUIT  BUTTON_BACK
+#define BOUNCE_MODE  BUTTON_MENU
+
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/brickmania.c ./rockbox.mod/apps/plugins/brickmania.c
--- ./rockbox.unmod/apps/plugins/brickmania.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/brickmania.c	2011-01-22 20:41:28.000000000 -0600
@@ -267,6 +267,15 @@
 #define UP BUTTON_UP
 #define DOWN BUTTON_DOWN
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define CONTINUE_TEXT "MENU To Continue"
+#define SELECT BUTTON_MENU
+#define QUIT   BUTTON_BACK
+#define LEFT   (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define RIGHT  (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define UP     (BUTTON_DPAD_UP | BUTTON_REL)
+#define DOWN   (BUTTON_DPAD_DOWN | BUTTON_REL)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/calculator.c ./rockbox.mod/apps/plugins/calculator.c
--- ./rockbox.unmod/apps/plugins/calculator.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/calculator.c	2011-01-22 20:44:44.000000000 -0600
@@ -408,6 +408,16 @@
 #define CALCULATOR_CALC  BUTTON_PLAY
 #define CALCULATOR_CLEAR BUTTON_MENU
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define CALCULATOR_LEFT  (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define CALCULATOR_RIGHT (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define CALCULATOR_UP    (BUTTON_DPAD_UP | BUTTON_REL)
+#define CALCULATOR_DOWN  (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define CALCULATOR_QUIT  BUTTON_BACK
+#define CALCULATOR_INPUT BUTTON_DPAD_CENTER
+#define CALCULATOR_CALC  BUTTON_MENU
+#define CALCULATOR_CLEAR (BUTTON_MENU | BUTTON_DPAD_CENTER)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/calendar.c ./rockbox.mod/apps/plugins/calendar.c
--- ./rockbox.unmod/apps/plugins/calendar.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/calendar.c	2011-01-22 20:45:37.000000000 -0600
@@ -288,6 +288,16 @@
 #define CALENDAR_NEXT_MONTH BUTTON_PLAY
 #define CALENDAR_PREV_MONTH BUTTON_MENU
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define CALENDAR_QUIT       BUTTON_BACK
+#define CALENDAR_SELECT     BUTTON_DPAD_CENTER
+#define CALENDAR_NEXT_WEEK  (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define CALENDAR_PREV_WEEK  (BUTTON_DPAD_UP | BUTTON_REL)
+#define CALENDAR_NEXT_DAY   (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define CALENDAR_PREV_DAY   (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define CALENDAR_NEXT_MONTH (BUTTON_MENU|BUTTON_DPAD_UP)
+#define CALENDAR_PREV_MONTH (BUTTON_MENU|BUTTON_DPAD_DOWN)
+
 #else
 #error "No keypad setting."
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/chessbox/chessbox_pgn.h ./rockbox.mod/apps/plugins/chessbox/chessbox_pgn.h
--- ./rockbox.unmod/apps/plugins/chessbox/chessbox_pgn.h	2011-01-22 09:02:09.000000000 -0600
+++ ./rockbox.mod/apps/plugins/chessbox/chessbox_pgn.h	2011-01-22 20:48:13.000000000 -0600
@@ -396,6 +396,17 @@
 #define CB_LEVEL   BUTTON_REC
 #define CB_MENU    (BUTTON_MENU | BUTTON_REPEAT)
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define CB_SELECT  BUTTON_DPAD_CENTER
+#define CB_UP      (BUTTON_DPAD_UP | BUTTON_REL)
+#define CB_DOWN    (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define CB_LEFT    (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define CB_RIGHT   (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define CB_PLAY    BUTTON_MENU
+#define CB_LEVEL   (BUTTON_MENU | BUTTON_DPAD_UP | BUTTON_REL)
+#define CB_RESTART (BUTTON_MENU | BUTTON_DPAD_DOWN | BUTTON_REL)
+#define CB_MENU    BUTTON_BACK
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/chessclock.c ./rockbox.mod/apps/plugins/chessclock.c
--- ./rockbox.unmod/apps/plugins/chessclock.c	2011-01-22 18:21:10.000000000 -0600
+++ ./rockbox.mod/apps/plugins/chessclock.c	2011-01-22 20:50:05.000000000 -0600
@@ -306,6 +306,16 @@
 #define CHC_SETTINGS_OK BUTTON_ENTER
 #define CHC_SETTINGS_CANCEL BUTTON_MENU
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define CHC_QUIT BUTTON_BACK
+#define CHC_STARTSTOP BUTTON_DPAD_CENTER
+#define CHC_RESET (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define CHC_MENU BUTTON_MENU
+#define CHC_SETTINGS_INC (BUTTON_DPAD_UP | BUTTON_REL)
+#define CHC_SETTINGS_DEC (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define CHC_SETTINGS_OK BUTTON_DPAD_CENTER
+#define CHC_SETTINGS_CANCEL BUTTON_BACK
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/chip8.c ./rockbox.mod/apps/plugins/chip8.c
--- ./rockbox.unmod/apps/plugins/chip8.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/chip8.c	2011-01-22 20:21:06.000000000 -0600
@@ -1167,6 +1167,15 @@
 #define CHIP8_KEY6 BUTTON_DOWN
 #define CHIP8_KEY8 BUTTON_UP
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define CHIP8_OFF  BUTTON_BACK
+#define CHIP8_KEY9 BUTTON_DPAD_CENTER
+#define CHIP8_KEY10 (BUTTON_DPAD_UP | BUTTON_REL)
+#define CHIP8_KEY11 BUTTON_MENU
+#define CHIP8_KEY12 (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define CHIP8_KEY13 (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define CHIP8_KEY14 (BUTTON_DPAD_DOWN | BUTTON_REL)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/chopper.c ./rockbox.mod/apps/plugins/chopper.c
--- ./rockbox.unmod/apps/plugins/chopper.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/chopper.c	2011-01-22 20:21:06.000000000 -0600
@@ -173,6 +173,11 @@
 #define ACTION BUTTON_ENTER
 #define ACTIONTEXT "ENTER"
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define QUIT BUTTON_BACK
+#define ACTION BUTTON_DPAD_CENTER
+#define ACTIONTEXT "CENTER"
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/clix.c ./rockbox.mod/apps/plugins/clix.c
--- ./rockbox.unmod/apps/plugins/clix.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/clix.c	2011-01-22 20:55:42.000000000 -0600
@@ -184,6 +184,16 @@
 #define CLIX_BUTTON_RIGHT       BUTTON_NEXT
 #define CLIX_BUTTON_CLICK       BUTTON_OK
 
+#elif (CONFIG_KEYPAD == ANDROID_PAD)
+#define CLIX_BUTTON_QUIT        BUTTON_BACK
+#define CLIX_BUTTON_UP          BUTTON_DPAD_UP
+#define CLIX_BUTTON_DOWN        (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define CLIX_BUTTON_SCROLL_FWD  (BUTTON_MENU | BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define CLIX_BUTTON_SCROLL_BACK (BUTTON_MENU | BUTTON_DPAD_LEFT | BUTTON_REL)
+#define CLIX_BUTTON_LEFT        (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define CLIX_BUTTON_RIGHT       (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define CLIX_BUTTON_CLICK       BUTTON_DPAD_CENTER
+
 #else
 #error "no keymap"
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/cube.c ./rockbox.mod/apps/plugins/cube.c
--- ./rockbox.unmod/apps/plugins/cube.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/cube.c	2011-01-22 20:57:33.000000000 -0600
@@ -309,6 +309,16 @@
 #define CUBE_PAUSE         BUTTON_PLAY
 #define CUBE_HIGHSPEED     BUTTON_ENTER
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define CUBE_QUIT          BUTTON_BACK
+#define CUBE_NEXT          (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define CUBE_PREV          (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define CUBE_INC           (BUTTON_DPAD_UP | BUTTON_REL)
+#define CUBE_DEC           (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define CUBE_MODE          BUTTON_DPAD_CENTER
+#define CUBE_PAUSE         BUTTON_MENU
+#define CUBE_HIGHSPEED     (BUTTON_MENU | BUTTON_DPAD_CENTER)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/doom/i_video.c ./rockbox.mod/apps/plugins/doom/i_video.c
--- ./rockbox.unmod/apps/plugins/doom/i_video.c	2011-01-22 09:02:15.000000000 -0600
+++ ./rockbox.mod/apps/plugins/doom/i_video.c	2011-01-22 20:59:54.000000000 -0600
@@ -401,7 +401,16 @@
 #define DOOMBUTTON_ESC     BUTTON_REC
 #define DOOMBUTTON_ENTER   BUTTON_PLAY
 #define DOOMBUTTON_WEAPON  (BUTTON_PLAY|BUTTON_REPEAT)
-
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define DOOMBUTTON_ESC     BUTTON_BACK
+#define DOOMBUTTON_UP      (BUTTON_DPAD_UP | BUTTON_REL)
+#define DOOMBUTTON_DOWN    (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define DOOMBUTTON_LEFT    (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define DOOMBUTTON_RIGHT   (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define DOOMBUTTON_SHOOT   BUTTON_DPAD_CENTER
+#define DOOMBUTTON_OPEN    BUTTON_DPAD_CENTER
+#define DOOMBUTTON_ENTER   BUTTON_MENU
+#define DOOMBUTTON_WEAPON  (BUTTON_MENU | BUTTON_REPEAT)
 #else
 #error Keymap not defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/fft/fft.c ./rockbox.mod/apps/plugins/fft/fft.c
--- ./rockbox.unmod/apps/plugins/fft/fft.c	2011-01-22 09:02:14.000000000 -0600
+++ ./rockbox.mod/apps/plugins/fft/fft.c	2011-01-22 21:01:01.000000000 -0600
@@ -240,6 +240,15 @@
 #   define FFT_AMP_SCALE    BUTTON_PLAY
 #   define FFT_QUIT        (BUTTON_REC | BUTTON_REPEAT)
 
+#elif (CONFIG_KEYPAD == ANDROID_PAD)
+#   define FFT_PREV_GRAPH  (BUTTON_DPAD_LEFT | BUTTON_REL)
+#   define FFT_NEXT_GRAPH  (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#   define FFT_AMP_SCALE   (BUTTON_DPAD_UP | BUTTON_REL)
+#   define FFT_FREQ_SCALE  (BUTTON_DPAD_DOWN | BUTTON_REL)
+#   define FFT_ORIENTATION  BUTTON_DPAD_CENTER
+#   define FFT_WINDOW       BUTTON_MENU
+#   define FFT_QUIT         BUTTON_BACK
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/flipit.c ./rockbox.mod/apps/plugins/flipit.c
--- ./rockbox.unmod/apps/plugins/flipit.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/flipit.c	2011-01-22 21:02:28.000000000 -0600
@@ -356,6 +356,17 @@
 #define FLIPIT_STEP_BY_STEP BUTTON_REC
 #define FLIPIT_TOGGLE       BUTTON_ENTER
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define FLIPIT_LEFT         (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define FLIPIT_RIGHT        (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define FLIPIT_UP           (BUTTON_DPAD_UP | BUTTON_REL)
+#define FLIPIT_DOWN         (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define FLIPIT_QUIT         BUTTON_BACK
+#define FLIPIT_SHUFFLE      (BUTTON_MENU | BUTTON_DPAD_LEFT | BUTTON_REL)
+#define FLIPIT_SOLVE        (BUTTON_MENU | BUTTON_DPAD_UP | BUTTON_REL)
+#define FLIPIT_STEP_BY_STEP (BUTTON_MENU | BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define FLIPIT_TOGGLE       BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/fractals/fractal.h ./rockbox.mod/apps/plugins/fractals/fractal.h
--- ./rockbox.unmod/apps/plugins/fractals/fractal.h	2011-01-22 09:02:13.000000000 -0600
+++ ./rockbox.mod/apps/plugins/fractals/fractal.h	2011-01-22 21:05:31.000000000 -0600
@@ -354,6 +354,19 @@
 #define FRACTAL_PRECISION_DEC   (BUTTON_PLAY | BUTTON_REW)
 #define FRACTAL_RESET           (BUTTON_PLAY | BUTTON_REC)
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define FRACTAL_QUIT            BUTTON_BACK
+#define FRACTAL_UP              (BUTTON_DPAD_UP | BUTTON_REL)
+#define FRACTAL_DOWN            (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define FRACTAL_LEFT            (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define FRACTAL_RIGHT           (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define FRACTAL_ZOOM_IN         BUTTON_DPAD_CENTER
+#define FRACTAL_ZOOM_IN2        (BUTTON_DPAD_CENTER | BUTTON_REPEAT)
+#define FRACTAL_ZOOM_OUT        BUTTON_MENU
+#define FRACTAL_PRECISION_INC   (BUTTON_MENU | BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define FRACTAL_PRECISION_DEC   (BUTTON_MENU | BUTTON_DPAD_LEFT | BUTTON_REL)
+#define FRACTAL_RESET           (BUTTON_MENU | BUTTON_DPAD_CENTER)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/imageviewer/imageviewer_button.h ./rockbox.mod/apps/plugins/imageviewer/imageviewer_button.h
--- ./rockbox.unmod/apps/plugins/imageviewer/imageviewer_button.h	2011-01-22 09:02:15.000000000 -0600
+++ ./rockbox.mod/apps/plugins/imageviewer/imageviewer_button.h	2011-01-22 21:07:20.000000000 -0600
@@ -352,6 +352,17 @@
 #define IMGVIEW_MENU        (BUTTON_ENTER | BUTTON_REPEAT)
 #define IMGVIEW_QUIT        BUTTON_REC
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define IMGVIEW_ZOOM_IN     BUTTON_DPAD_CENTER
+#define IMGVIEW_ZOOM_OUT    BUTTON_MENU
+#define IMGVIEW_UP          (BUTTON_DPAD_UP | BUTTON_REL)
+#define IMGVIEW_DOWN        (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define IMGVIEW_LEFT        (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define IMGVIEW_RIGHT       (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define IMGVIEW_NEXT        (BUTTON_MENU | BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define IMGVIEW_PREVIOUS    (BUTTON_MENU | BUTTON_DPAD_LEFT | BUTTON_REL)
+#define IMGVIEW_MENU        BUTTON_BACK
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/invadrox.c ./rockbox.mod/apps/plugins/invadrox.c
--- ./rockbox.unmod/apps/plugins/invadrox.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/invadrox.c	2011-01-22 20:21:06.000000000 -0600
@@ -220,6 +220,13 @@
 #define RIGHT BUTTON_ENTER
 #define FIRE  BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+
+#define QUIT BUTTON_BACK
+#define LEFT (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define RIGHT (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define FIRE BUTTON_DPAD_CENTER
+
 #else
     #error INVADROX: Unsupported keypad
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/jewels.c ./rockbox.mod/apps/plugins/jewels.c
--- ./rockbox.unmod/apps/plugins/jewels.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/jewels.c	2011-01-22 21:19:27.000000000 -0600
@@ -303,6 +303,16 @@
 #define HK_SELECT "ENTER"
 #define HK_CANCEL "MENU"
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define JEWELS_UP     (BUTTON_DPAD_UP | BUTTON_REL)
+#define JEWELS_DOWN   (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define JEWELS_LEFT   (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define JEWELS_RIGHT  (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define JEWELS_SELECT BUTTON_DPAD_CENTER
+#define JEWELS_CANCEL BUTTON_BACK
+#define HK_SELECT "CENTER"
+#define HK_CANCEL "BACK"
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/lib/pluginlib_actions.c ./rockbox.mod/apps/plugins/lib/pluginlib_actions.c
--- ./rockbox.unmod/apps/plugins/lib/pluginlib_actions.c	2011-01-22 09:02:13.000000000 -0600
+++ ./rockbox.mod/apps/plugins/lib/pluginlib_actions.c	2011-01-22 20:21:06.000000000 -0600
@@ -209,7 +209,15 @@
     { PLA_DOWN_REPEAT,       BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_NONE},
     { PLA_LEFT_REPEAT,       BUTTON_REW|BUTTON_REPEAT,          BUTTON_NONE},
     { PLA_RIGHT_REPEAT,      BUTTON_FF|BUTTON_REPEAT,           BUTTON_NONE},
-
+#elif (CONFIG_KEYPAD == ANDROID_PAD)
+    { PLA_UP,               BUTTON_DPAD_UP|BUTTON_REL,                      BUTTON_NONE },
+    { PLA_DOWN,             BUTTON_DPAD_DOWN|BUTTON_REL,                    BUTTON_NONE },
+    { PLA_LEFT,             BUTTON_DPAD_LEFT|BUTTON_REL,                    BUTTON_NONE },
+    { PLA_RIGHT,            BUTTON_DPAD_RIGHT|BUTTON_REL,                   BUTTON_NONE },
+    { PLA_UP_REPEAT,        BUTTON_DPAD_UP|BUTTON_REL|BUTTON_REPEAT,        BUTTON_NONE },
+    { PLA_DOWN_REPEAT,      BUTTON_DPAD_DOWN|BUTTON_REL|BUTTON_REPEAT,      BUTTON_NONE },
+    { PLA_LEFT_REPEAT,      BUTTON_LEFT|BUTTON_REL|BUTTON_REPEAT,           BUTTON_NONE },
+    { PLA_RIGHT_REPEAT,     BUTTON_RIGHT|BUTTON_REL|BUTTON_REPEAT,          BUTTON_NONE },
 #else
 #   ifndef HAVE_TOUCHSCREEN
 #       error pluginlib_actions: No directions defined
@@ -382,6 +390,12 @@
     {PLA_SELECT,            BUTTON_ENTER,                       BUTTON_NONE},
     {PLA_SELECT_REL,        BUTTON_ENTER|BUTTON_REL,            BUTTON_ENTER},
     {PLA_SELECT_REPEAT,     BUTTON_ENTER|BUTTON_REPEAT,         BUTTON_NONE},
+#elif (CONFIG_KEYPAD == ANDROID_PAD)                                      
+    {PLA_CANCEL,            BUTTON_BACK,                              BUTTON_NONE},
+    {PLA_EXIT,              BUTTON_BACK|BUTTON_REPEAT,                BUTTON_NONE},
+    {PLA_SELECT,            BUTTON_DPAD_CENTER,                       BUTTON_NONE},
+    {PLA_SELECT_REL,        BUTTON_DPAD_CENTER|BUTTON_REL,            BUTTON_DPAD_CENTER},
+    {PLA_SELECT_REPEAT,     BUTTON_DPAD_CENTER|BUTTON_REPEAT,         BUTTON_NONE},
 #else
 #   ifndef HAVE_TOUCHSCREEN
 #       error pluginlib_actions: No actions defined
diff -Naur ./rockbox.unmod/apps/plugins/logo.c ./rockbox.mod/apps/plugins/logo.c
--- ./rockbox.unmod/apps/plugins/logo.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/logo.c	2011-01-22 21:23:23.000000000 -0600
@@ -214,6 +214,13 @@
 #define LP_DEC_Y BUTTON_DOWN
 #define LP_INC_Y BUTTON_UP
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define LP_QUIT  BUTTON_BACK
+#define LP_DEC_X (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define LP_INC_X (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define LP_DEC_Y (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define LP_INC_Y (BUTTON_DPAD_UP|BUTTON_REL)
+
 #else
 #define LP_QUIT BUTTON_OFF
 #define LP_DEC_X BUTTON_LEFT
diff -Naur ./rockbox.unmod/apps/plugins/matrix.c ./rockbox.mod/apps/plugins/matrix.c
--- ./rockbox.unmod/apps/plugins/matrix.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/matrix.c	2011-01-22 21:24:02.000000000 -0600
@@ -169,6 +169,12 @@
 #define MATRIX_SLEEP_LESS BUTTON_DOWN
 #define MATRIX_PAUSE BUTTON_PLAY
 
+#elif (CONFIG_KEYPAD == ANDROID_PAD)
+#define MATRIX_EXIT BUTTON_BACK
+#define MATRIX_SLEEP_MORE (BUTTON_DPAD_UP|BUTTON_REL)
+#define MATRIX_SLEEP_LESS (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define MATRIX_PAUSE BUTTON_DPAD_CENTER
+
 #else
 #error Unsupported keypad
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/midi/midiplay.c ./rockbox.mod/apps/plugins/midi/midiplay.c
--- ./rockbox.unmod/apps/plugins/midi/midiplay.c	2011-01-22 09:02:13.000000000 -0600
+++ ./rockbox.mod/apps/plugins/midi/midiplay.c	2011-01-22 20:21:06.000000000 -0600
@@ -217,6 +217,14 @@
 #define BTN_DOWN         BUTTON_DOWN
 #define BTN_PLAY         BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define BTN_QUIT         BUTTON_BACK
+#define BTN_RIGHT        (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define BTN_LEFT         (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define BTN_UP           (BUTTON_DPAD_UP | BUTTON_REL)
+#define BTN_DOWN         (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define BTN_PLAY         BUTTON_DPAD_CENTER
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/minesweeper.c ./rockbox.mod/apps/plugins/minesweeper.c
--- ./rockbox.unmod/apps/plugins/minesweeper.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/minesweeper.c	2011-01-22 21:26:00.000000000 -0600
@@ -287,6 +287,16 @@
 #   define MINESWP_DISCOVER BUTTON_FF
 #   define MINESWP_INFO     BUTTON_REW
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#   define MINESWP_LEFT     (BUTTON_DPAD_LEFT|BUTTON_REL)
+#   define MINESWP_RIGHT    (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#   define MINESWP_UP       (BUTTON_DPAD_UP|BUTTON_REL)
+#   define MINESWP_DOWN     (BUTTON_DPAD_DOWN|BUTTON_REL)
+#   define MINESWP_QUIT     BUTTON_BACK
+#   define MINESWP_TOGGLE   BUTTON_MENU
+#   define MINESWP_DISCOVER BUTTON_DPAD_CENTER
+#   define MINESWP_INFO     (BUTTON_MENU|BUTTON_DPAD_CENTER)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/mosaique.c ./rockbox.mod/apps/plugins/mosaique.c
--- ./rockbox.unmod/apps/plugins/mosaique.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/mosaique.c	2011-01-22 21:27:20.000000000 -0600
@@ -183,6 +183,11 @@
 #define MOSAIQUE_SPEED BUTTON_ENTER
 #define MOSAIQUE_RESTART BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define MOSAIQUE_QUIT BUTTON_BACK
+#define MOSAIQUE_SPEED BUTTON_DPAD_CENTER
+#define MOSAIQUE_RESTART BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/mp3_encoder.c ./rockbox.mod/apps/plugins/mp3_encoder.c
--- ./rockbox.unmod/apps/plugins/mp3_encoder.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/mp3_encoder.c	2011-01-22 21:27:59.000000000 -0600
@@ -2499,6 +2499,12 @@
 #define MP3ENC_DONE BUTTON_PLAY
 #define MP3ENC_SELECT BUTTON_ENTER
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define MP3ENC_PREV (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define MP3ENC_NEXT (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define MP3ENC_DONE BUTTON_BACK
+#define MP3ENC_SELECT BUTTON_DPAD_CENTER
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/mpegplayer/mpegplayer.c ./rockbox.mod/apps/plugins/mpegplayer/mpegplayer.c
--- ./rockbox.unmod/apps/plugins/mpegplayer/mpegplayer.c	2011-01-22 09:02:14.000000000 -0600
+++ ./rockbox.mod/apps/plugins/mpegplayer/mpegplayer.c	2011-01-22 21:30:05.000000000 -0600
@@ -345,6 +345,15 @@
 #define MPEG_RW         BUTTON_REW
 #define MPEG_FF         BUTTON_FF
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define MPEG_MENU       BUTTON_MENU
+#define MPEG_STOP       BUTTON_BACK
+#define MPEG_PAUSE      BUTTON_DPAD_CENTER
+#define MPEG_VOLDOWN    (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define MPEG_VOLUP      (BUTTON_DPAD_UP|BUTTON_REL)
+#define MPEG_RW         (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define MPEG_FF         (BUTTON_DPAD_RIGHT|BUTTON_REL)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/mpegplayer/mpeg_settings.c ./rockbox.mod/apps/plugins/mpegplayer/mpeg_settings.c
--- ./rockbox.unmod/apps/plugins/mpegplayer/mpeg_settings.c	2011-01-22 09:02:14.000000000 -0600
+++ ./rockbox.mod/apps/plugins/mpegplayer/mpeg_settings.c	2011-01-22 21:30:42.000000000 -0600
@@ -232,6 +232,14 @@
 #define MPEG_START_TIME_DOWN        BUTTON_DOWN
 #define MPEG_START_TIME_EXIT        BUTTON_REC
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define MPEG_START_TIME_SELECT      BUTTON_DPAD_CENTER
+#define MPEG_START_TIME_LEFT        (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define MPEG_START_TIME_RIGHT       (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define MPEG_START_TIME_UP          (BUTTON_DPAD_UP|BUTTON_REL)
+#define MPEG_START_TIME_DOWN        (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define MPEG_START_TIME_EXIT        BUTTON_BACK
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/oscilloscope.c ./rockbox.mod/apps/plugins/oscilloscope.c
--- ./rockbox.unmod/apps/plugins/oscilloscope.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/oscilloscope.c	2011-01-22 21:32:52.000000000 -0600
@@ -320,6 +320,17 @@
 #define OSCILLOSCOPE_VOL_UP       BUTTON_UP
 #define OSCILLOSCOPE_VOL_DOWN     BUTTON_DOWN
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define OSCILLOSCOPE_QUIT         BUTTON_BACK
+#define OSCILLOSCOPE_DRAWMODE     BUTTON_MENU
+#define OSCILLOSCOPE_ADVMODE      (BUTTON_MENU|BUTTON_DPAD_CENTER)
+#define OSCILLOSCOPE_ORIENTATION  (BUTTON_MENU|BUTTON_DPAD_UP|BUTTON_REL)
+#define OSCILLOSCOPE_PAUSE        BUTTON_DPAD_CENTER
+#define OSCILLOSCOPE_SPEED_UP     (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define OSCILLOSCOPE_SPEED_DOWN   (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define OSCILLOSCOPE_VOL_UP       (BUTTON_DPAD_UP|BUTTON_REL)
+#define OSCILLOSCOPE_VOL_DOWN     (BUTTON_DPAD_DOWN|BUTTON_REL)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/pacbox/pacbox.h ./rockbox.mod/apps/plugins/pacbox/pacbox.h
--- ./rockbox.unmod/apps/plugins/pacbox/pacbox.h	2011-01-22 09:02:14.000000000 -0600
+++ ./rockbox.mod/apps/plugins/pacbox/pacbox.h	2011-01-22 21:35:25.000000000 -0600
@@ -243,6 +243,17 @@
 #define PACMAN_COIN     BUTTON_OK
 #define PACMAN_MENU     BUTTON_MENU
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+
+#define PACMAN_UP       (BUTTON_DPAD_UP|BUTTON_REL)
+#define PACMAN_DOWN     (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define PACMAN_LEFT     (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define PACMAN_RIGHT    (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define PACMAN_1UP      BUTTON_DPAD_CENTER
+#define PACMAN_2UP      (BUTTON_MENU|BUTTON_DPAD_CENTER)
+#define PACMAN_COIN     BUTTON_MENU
+#define PACMAN_MENU     BUTTON_BACK
+
 #else
 
 #error Keymap not defined!
diff -Naur ./rockbox.unmod/apps/plugins/pegbox.c ./rockbox.mod/apps/plugins/pegbox.c
--- ./rockbox.unmod/apps/plugins/pegbox.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/pegbox.c	2011-01-22 21:41:10.000000000 -0600
@@ -472,6 +472,25 @@
 #define LVL_DOWN_TEXT "FF"
 #define SELECT_TEXT "FUNC"
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define PEGBOX_SAVE     BUTTON_MENU
+#define PEGBOX_SELECT   BUTTON_DPAD_CENTER
+#define PEGBOX_QUIT     BUTTON_BACK
+#define PEGBOX_RESTART  (BUTTON_MENU|BUTTON_DPAD_CENTER)
+#define PEGBOX_LVL_UP   (BUTTON_DPAD_CENTER|BUTTON_DPAD_UP|BUTTON_REL)
+#define PEGBOX_LVL_DOWN (BUTTON_DPAD_CENTER|BUTTON_DPAD_DOWN|BUTTON_REL)
+#define PEGBOX_UP       (BUTTON_DPAD_UP|BUTTON_REL)
+#define PEGBOX_DOWN     (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define PEGBOX_RIGHT    (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define PEGBOX_LEFT     (BUTTON_DPAD_LEFT|BUTTON_REL)
+
+#define SAVE_TEXT "MENU + LEFT"
+#define QUIT_TEXT "BACK"
+#define RESTART_TEXT "MENU + CENTER"
+#define LVL_UP_TEXT "CENTER + UP"
+#define LVL_DOWN_TEXT "CENTER + DOWN"
+#define SELECT_TEXT "CENTER"
+
 #else
 #error Unsupported keymap!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/pong.c ./rockbox.mod/apps/plugins/pong.c
--- ./rockbox.unmod/apps/plugins/pong.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/pong.c	2011-01-22 21:42:20.000000000 -0600
@@ -236,6 +236,14 @@
 #define PONG_RIGHT_UP BUTTON_UP
 #define PONG_RIGHT_DOWN BUTTON_DOWN
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define PONG_QUIT BUTTON_BACK
+#define PONG_PAUSE BUTTON_MENU
+#define PONG_LEFT_UP (BUTTON_DPAD_UP|BUTTON_REL)
+#define PONG_LEFT_DOWN (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define PONG_RIGHT_UP BUTTON_NONE
+#define PONG_RIGHT_DOWN BUTTON_NONE
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/reversi/reversi-gui.h ./rockbox.mod/apps/plugins/reversi/reversi-gui.h
--- ./rockbox.unmod/apps/plugins/reversi/reversi-gui.h	2011-01-22 09:02:13.000000000 -0600
+++ ./rockbox.mod/apps/plugins/reversi/reversi-gui.h	2011-01-22 21:44:15.000000000 -0600
@@ -243,6 +243,15 @@
 #define REVERSI_BUTTON_MAKE_MOVE BUTTON_ENTER
 #define REVERSI_BUTTON_MENU BUTTON_MENU
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define REVERSI_BUTTON_QUIT BUTTON_BACK
+#define REVERSI_BUTTON_UP (BUTTON_DPAD_UP|BUTTON_REL)
+#define REVERSI_BUTTON_DOWN (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define REVERSI_BUTTON_LEFT (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define REVERSI_BUTTON_RIGHT (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define REVERSI_BUTTON_MAKE_MOVE BUTTON_DPAD_CENTER 
+#define REVERSI_BUTTON_MENU BUTTON_MENU 
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/rockblox1d.c ./rockbox.mod/apps/plugins/rockblox1d.c
--- ./rockbox.unmod/apps/plugins/rockblox1d.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/rockblox1d.c	2011-01-22 21:45:02.000000000 -0600
@@ -124,11 +124,15 @@
 #define ONEDROCKBLOX_DOWN              BUTTON_DOWN
 #define ONEDROCKBLOX_QUIT              (BUTTON_REC | BUTTON_REPEAT)
 
-#elif defined(HAVE_TOUCHSCREEN)
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define ONEDROCKBLOX_DOWN              BUTTON_DPAD_CENTER
+#define ONEDROCKBLOX_QUIT              BUTTON_BACK
 
+#elif defined(HAVE_TOUCHSCREEN)
 #define ONEDROCKBLOX_DOWN              BUTTON_BOTTOMMIDDLE
 #define ONEDROCKBLOX_QUIT              BUTTON_POWER
 
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/rockblox.c ./rockbox.mod/apps/plugins/rockblox.c
--- ./rockbox.unmod/apps/plugins/rockblox.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/rockblox.c	2011-01-22 21:47:18.000000000 -0600
@@ -359,6 +359,17 @@
 #define ROCKBLOX_DROP          BUTTON_PLAY
 #define ROCKBLOX_RESTART       BUTTON_REC
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+
+#define ROCKBLOX_OFF           BUTTON_BACK
+#define ROCKBLOX_ROTATE_CCW    (BUTTON_DPAD_UP|BUTTON_REL)
+#define ROCKBLOX_ROTATE_CW     BUTTON_DPAD_CENTER
+#define ROCKBLOX_DOWN          (BUTTON_DPAD_DOWN | BUTTON_REL)
+#define ROCKBLOX_LEFT          (BUTTON_DPAD_LEFT | BUTTON_REL)
+#define ROCKBLOX_RIGHT         (BUTTON_DPAD_RIGHT | BUTTON_REL)
+#define ROCKBLOX_DROP          BUTTON_MENU
+#define ROCKBLOX_RESTART       (BUTTON_MENU|BUTTON_DPAD_CENTER)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/rockboy/rockboy.c ./rockbox.mod/apps/plugins/rockboy/rockboy.c
--- ./rockbox.unmod/apps/plugins/rockboy/rockboy.c	2011-01-22 09:02:16.000000000 -0600
+++ ./rockbox.mod/apps/plugins/rockboy/rockboy.c	2011-01-22 21:48:50.000000000 -0600
@@ -318,6 +318,17 @@
         options.SELECT = (BUTTON_ENTER | BUTTON_REPEAT);
         options.MENU   = (BUTTON_MENU | BUTTON_REPEAT);
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+        options.UP      = (BUTTON_DPAD_UP|BUTTON_REL);
+        options.DOWN    = (BUTTON_DPAD_DOWN|BUTTON_REL);
+        options.LEFT    = (BUTTON_DPAD_LEFT|BUTTON_REL);
+        options.RIGHT   = (BUTTON_DPAD_RIGHT|BUTTON_REL);
+        options.A       = BUTTON_DPAD_CENTER;
+        options.B       = BUTTON_MENU;
+        options.START   = (BUTTON_MENU|BUTTON_DPAD_CENTER);
+        options.SELECT  = (BUTTON_MENU|BUTTON_BACK);
+        options.MENU    = BUTTON_BACK;
+
 #else
 #error No Keymap Defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/rockpaint.c ./rockbox.mod/apps/plugins/rockpaint.c
--- ./rockbox.unmod/apps/plugins/rockpaint.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/rockpaint.c	2011-01-22 21:50:06.000000000 -0600
@@ -210,6 +210,17 @@
 #define ROCKPAINT_LEFT      BUTTON_PREV
 #define ROCKPAINT_RIGHT     BUTTON_NEXT
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define ROCKPAINT_QUIT      BUTTON_BACK
+#define ROCKPAINT_DRAW      BUTTON_DPAD_CENTER
+#define ROCKPAINT_MENU      BUTTON_MENU
+#define ROCKPAINT_TOOLBAR   (BUTTON_MENU|BUTTON_DPAD_UP|BUTTON_REL)
+#define ROCKPAINT_TOOLBAR2  (BUTTON_MENU|BUTTON_DPAD_DOWN|BUTTON_REL)
+#define ROCKPAINT_UP        (BUTTON_DPAD_UP|BUTTON_REL)
+#define ROCKPAINT_DOWN      (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define ROCKPAINT_LEFT      (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define ROCKPAINT_RIGHT     (BUTTON_DPAD_RIGHT|BUTTON_REL)
+
 #else
 #error "Please define keys for this keypad"
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/sliding_puzzle.c ./rockbox.mod/apps/plugins/sliding_puzzle.c
--- ./rockbox.unmod/apps/plugins/sliding_puzzle.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/sliding_puzzle.c	2011-01-22 21:51:32.000000000 -0600
@@ -245,6 +245,15 @@
 #define PUZZLE_SHUFFLE BUTTON_ENTER
 #define PUZZLE_PICTURE BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define PUZZLE_QUIT    BUTTON_BACK
+#define PUZZLE_LEFT    (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define PUZZLE_RIGHT   (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define PUZZLE_UP      (BUTTON_DPAD_UP|BUTTON_REL)
+#define PUZZLE_DOWN    (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define PUZZLE_SHUFFLE BUTTON_MENU
+#define PUZZLE_PICTURE BUTTON_DPAD_CENTER
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/snake2.c ./rockbox.mod/apps/plugins/snake2.c
--- ./rockbox.unmod/apps/plugins/snake2.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/snake2.c	2011-01-22 21:52:27.000000000 -0600
@@ -336,6 +336,15 @@
 #define SNAKE2_PLAYPAUSE BUTTON_PLAY
 #define SNAKE2_PLAYPAUSE_TEXT "Play"
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define SNAKE2_LEFT      (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define SNAKE2_RIGHT     (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define SNAKE2_UP        (BUTTON_DPAD_UP|BUTTON_REL)
+#define SNAKE2_DOWN      (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define SNAKE2_QUIT      BUTTON_BACK
+#define SNAKE2_PLAYPAUSE BUTTON_MENU
+#define SNAKE2_PLAYPAUSE_TEXT "Menu"
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/snake.c ./rockbox.mod/apps/plugins/snake.c
--- ./rockbox.unmod/apps/plugins/snake.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/snake.c	2011-01-22 21:53:06.000000000 -0600
@@ -225,6 +225,14 @@
 #define SNAKE_DOWN BUTTON_DOWN
 #define SNAKE_PLAYPAUSE BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define SNAKE_QUIT      BUTTON_BACK
+#define SNAKE_LEFT      (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define SNAKE_RIGHT     (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define SNAKE_UP        (BUTTON_DPAD_UP|BUTTON_REL)
+#define SNAKE_DOWN      (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define SNAKE_PLAYPAUSE BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/snow.c ./rockbox.mod/apps/plugins/snow.c
--- ./rockbox.unmod/apps/plugins/snow.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/snow.c	2011-01-22 20:21:06.000000000 -0600
@@ -66,7 +66,8 @@
 #define SNOW_QUIT (BUTTON_HOME|BUTTON_REPEAT)
 
 #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) || \
-(CONFIG_KEYPAD == CREATIVEZVM_PAD)
+(CONFIG_KEYPAD == CREATIVEZVM_PAD) || \
+(CONFIG_KEYPAD == ANDROID_PAD)
 #define SNOW_QUIT BUTTON_BACK
 
 #elif (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
diff -Naur ./rockbox.unmod/apps/plugins/sokoban.c ./rockbox.mod/apps/plugins/sokoban.c
--- ./rockbox.unmod/apps/plugins/sokoban.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/sokoban.c	2011-01-22 21:59:40.000000000 -0600
@@ -491,6 +491,26 @@
 #define BUTTON_SAVE          (BUTTON_PLAY|BUTTON_ENTER)
 #define BUTTON_SAVE_NAME "PLAY+ENTER"
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define SOKOBAN_LEFT          (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define SOKOBAN_RIGHT         (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define SOKOBAN_UP            (BUTTON_DPAD_UP|BUTTON_REL)
+#define SOKOBAN_DOWN          (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define SOKOBAN_MENU          BUTTON_BACK
+#define SOKOBAN_UNDO          BUTTON_MENU
+#define SOKOBAN_REDO          (BUTTON_MENU|BUTTON_DPAD_CENTER)
+#define SOKOBAN_LEVEL_DOWN    (BUTTON_MENU|BUTTON_DPAD_LEFT|BUTTON_REL)
+#define SOKOBAN_LEVEL_REPEAT  (BUTTON_MENU|BUTTON_DPAD_UP|BUTTON_REL)
+#define SOKOBAN_LEVEL_UP      (BUTTON_MENU|BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define SOKOBAN_PAUSE         BUTTON_CENTER
+#define BUTTON_SAVE           (BUTTON_MENU|BUTTON_BACK)
+#define BUTTON_SAVE_NAME          "MENU + BACK"
+#define SOKOBAN_MENU_NAME         "BACK"
+#define SOKOBAN_UNDO_NAME         "MENU"
+#define SOKOBAN_REDO_NAME         "MENU + CENTER"
+#define SOKOBAN_PAUSE_NAME        "CENTER"
+#define SOKOBAN_LEVEL_REPEAT_NAME "MENU + UP"
+
 #else
 #error No keymap defined!
 #endif
@@ -532,6 +552,7 @@
 #define BUTTON_SAVE           BUTTON_CENTER
 #define BUTTON_SAVE_NAME      "CENTER"
 #endif
+
 #endif
 
 #define SOKOBAN_FONT FONT_SYSFIXED
@@ -1468,6 +1489,13 @@
                 rb->lcd_putsxy(3, 36, "[PREV] Previous Level");
                 rb->lcd_putsxy(3, 46, "[PLAY] Restart Level");
                 rb->lcd_putsxy(3, 56, "[NEXT] Next Level");
+#elif CONFIG_KEYPAD == ANDROID_PAD
+                rb->lcd_putsxy(3,  6, "[BACK] Menu");
+                rb->lcd_putsxy(3, 16, "[MENU] Undo");
+                rb->lcd_putsxy(3, 26, "[MENU+CENTER] Redo");
+                rb->lcd_putsxy(3, 36, "[MENU+LEFT] Previous Level");
+                rb->lcd_putsxy(3, 46, "[MENU+CENTER] Restart Level");
+                rb->lcd_putsxy(3, 56, "[MENU+RIGHT] Up Level");
 #endif
 
 #ifdef HAVE_TOUCHSCREEN
diff -Naur ./rockbox.unmod/apps/plugins/solitaire.c ./rockbox.mod/apps/plugins/solitaire.c
--- ./rockbox.unmod/apps/plugins/solitaire.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/solitaire.c	2011-01-22 22:07:59.000000000 -0600
@@ -507,6 +507,23 @@
 #   define HK_CUR2STACK    "PLAY"
 #   define HK_REM2STACK    "PLAY...."
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#   define SOL_QUIT          BUTTON_BACK
+#   define SOL_UP            (BUTTON_DPAD_UP|BUTTON_REL)
+#   define SOL_DOWN          (BUTTON_DPAD_DOWN|BUTTON_REL)
+#   define SOL_LEFT          (BUTTON_DPAD_LEFT|BUTTON_REL)
+#   define SOL_RIGHT         (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#   define SOL_MOVE          BUTTON_DPAD_CENTER
+#   define SOL_DRAW          BUTTON_MENU
+#   define SOL_REM2CUR       (BUTTON_DPAD_CENTER|BUTTON_REPEAT)
+#   define SOL_CUR2STACK     (BUTTON_DPAD_CENTER|BUTTON_DPAD_DOWN|BUTTON_REL)
+#   define SOL_REM2STACK     (BUTTON_DPAD_CENTER|BUTTON_DPAD_UP|BUTTON_REL)
+#   define HK_MOVE          "CENTER"
+#   define HK_DRAW          "MENU"
+#   define HK_REM2CUR       "CENTER.."
+#   define HK_CUR2STACK     "CENTER+UP"
+#   define HK_REM2STACK     "CENTER+DOWN"
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/spacerocks.c ./rockbox.mod/apps/plugins/spacerocks.c
--- ./rockbox.unmod/apps/plugins/spacerocks.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/spacerocks.c	2011-01-22 22:09:37.000000000 -0600
@@ -258,6 +258,15 @@
 #define AST_RIGHT BUTTON_FF
 #define AST_FIRE BUTTON_ENTER
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define AST_PAUSE      BUTTON_MENU
+#define AST_QUIT       BUTTON_BACK
+#define AST_THRUST     (BUTTON_DPAD_UP|BUTTON_REL)
+#define AST_HYPERSPACE (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define AST_LEFT       (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define AST_RIGHT      (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define AST_FIRE       BUTTON_CENTER
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/star.c ./rockbox.mod/apps/plugins/star.c
--- ./rockbox.unmod/apps/plugins/star.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/star.c	2011-01-22 22:12:04.000000000 -0600
@@ -446,6 +446,22 @@
 #define STAR_LEVEL_DOWN_NAME "REC"
 #define STAR_LEVEL_REPEAT_NAME "MENU LONG"
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define STAR_QUIT           BUTTON_BACK
+#define STAR_LEFT           (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define STAR_RIGHT          (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define STAR_UP             (BUTTON_DPAD_UP|BUTTON_REL)
+#define STAR_DOWN           (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define STAR_TOGGLE_CONTROL BUTTON_MENU
+#define STAR_LEVEL_UP       (BUTTON_MENU|BUTTON_DPAD_UP|BUTTON_REL)
+#define STAR_LEVEL_DOWN     (BUTTON_MENU|BUTTON_DPAD_DOWN|BUTTON_REL)
+#define STAR_LEVEL_REPEAT   (BUTTON_MENU|BUTTON_DPAD_CENTER)
+#define STAR_TOGGLE_CONTROL_NAME "MENU"
+#define STAR_QUIT_NAME           "BACK"
+#define STAR_LEVEL_UP_NAME       "MENU+UP"
+#define STAR_LEVEL_DOWN_NAME     "MENU+DOWN"
+#define STAR_LEVEL_REPEAT_NAME   "MENU+CENTER"
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/stats.c ./rockbox.mod/apps/plugins/stats.c
--- ./rockbox.unmod/apps/plugins/stats.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/stats.c	2011-01-22 20:21:06.000000000 -0600
@@ -88,7 +88,8 @@
 #elif CONFIG_KEYPAD == IAUDIO67_PAD
 #define STATS_STOP BUTTON_POWER
 
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
+#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD) || \
+(CONFIG_KEYPAD == ANDROID_PAD)
 #define STATS_STOP BUTTON_BACK
 
 #elif (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
diff -Naur ./rockbox.unmod/apps/plugins/sudoku/sudoku.h ./rockbox.mod/apps/plugins/sudoku/sudoku.h
--- ./rockbox.unmod/apps/plugins/sudoku/sudoku.h	2011-01-22 09:02:14.000000000 -0600
+++ ./rockbox.mod/apps/plugins/sudoku/sudoku.h	2011-01-22 22:14:49.000000000 -0600
@@ -309,6 +309,16 @@
 #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_DOWN
 #define SUDOKU_BUTTON_POSSIBLE   BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define SUDOKU_BUTTON_QUIT BUTTON_BACK
+#define SUDOKU_BUTTON_UP        (BUTTON_DPAD_UP|BUTTON_REL)
+#define SUDOKU_BUTTON_DOWN      (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define SUDOKU_BUTTON_LEFT      (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define SUDOKU_BUTTON_RIGHT     (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define SUDOKU_BUTTON_TOGGLE    BUTTON_DPAD_CENTER
+#define SUDOKU_BUTTON_MENU      BUTTON_MENU
+#define SUDOKU_BUTTON_POSSIBLE  (BUTTON_MENU|BUTTON_DPAD_CENTER)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/text_viewer/tv_button.h ./rockbox.mod/apps/plugins/text_viewer/tv_button.h
--- ./rockbox.unmod/apps/plugins/text_viewer/tv_button.h	2011-01-22 09:02:14.000000000 -0600
+++ ./rockbox.mod/apps/plugins/text_viewer/tv_button.h	2011-01-22 22:16:16.000000000 -0600
@@ -413,6 +413,17 @@
 #define TV_AUTOSCROLL   BUTTON_ENTER
 #define TV_BOOKMARK     BUTTON_PLAY
 
+/* ANDROID keys */
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define TV_QUIT           BUTTON_BACK
+#define TV_SCROLL_UP      (BUTTON_DPAD_UP|BUTTON_REL)
+#define TV_SCROLL_DOWN    (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define TV_SCREEN_LEFT    (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define TV_SCREEN_RIGHT   (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define TV_MENU           BUTTON_MENU
+#define TV_AUTOSCROLL     BUTTON_DPAD_CENTER
+#define TV_BOOKMARK       (BUTTON_MENU|BUTTON_DPAD_CENTER)
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/vu_meter.c ./rockbox.mod/apps/plugins/vu_meter.c
--- ./rockbox.unmod/apps/plugins/vu_meter.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/vu_meter.c	2011-01-22 22:18:00.000000000 -0600
@@ -316,6 +316,17 @@
 #define LABEL_MENU "MENU"
 #define LABEL_VOLUME "UP/DOWN"
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+#define VUMETER_QUIT BUTTON_BACK
+#define VUMETER_HELP (BUTTON_MENU|BUTTON_DPAD_CENTER)
+#define VUMETER_MENU BUTTON_MENU
+#define VUMETER_UP   (BUTTON_DPAD_UP|BUTTON_REL)
+#define VUMETER_DOWN (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define LABEL_HELP   "MENU+CENTER"
+#define LABEL_QUIT   "BACK"
+#define LABEL_MENU   "MENU"
+#define LABEL_VOLUME "UP/DOWN"
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/wormlet.c ./rockbox.mod/apps/plugins/wormlet.c
--- ./rockbox.unmod/apps/plugins/wormlet.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/wormlet.c	2011-01-22 22:18:55.000000000 -0600
@@ -300,6 +300,15 @@
 #define BTN_QUIT BUTTON_REC
 #define BTN_STOPRESET (BUTTON_MENU | BUTTON_REPEAT)
 
+#elif (CONFIG_KEYPAD == ANDROID_PAD)
+#define BTN_DIR_UP     (BUTTON_DPAD_UP|BUTTON_REL)
+#define BTN_DIR_DOWN   (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define BTN_DIR_LEFT   (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define BTN_DIR_RIGHT  (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define BTN_STARTPAUSE BUTTON_DPAD_CENTER
+#define BTN_QUIT       BUTTON_BACK
+#define BTN_STOPRESET  BUTTON_MENU
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/xobox.c ./rockbox.mod/apps/plugins/xobox.c
--- ./rockbox.unmod/apps/plugins/xobox.c	2011-01-22 09:02:17.000000000 -0600
+++ ./rockbox.mod/apps/plugins/xobox.c	2011-01-22 22:20:06.000000000 -0600
@@ -259,6 +259,15 @@
 #define DOWN  BUTTON_DOWN
 #define PAUSE BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+
+#define QUIT  BUTTON_BACK
+#define LEFT  (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define RIGHT (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define DOWN  (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define UP    (BUTTON_DPAD_UP|BUTTON_REL)
+#define PAUSE BUTTON_DPAD_CENTER
+
 #else
 #error No keymap defined!
 #endif
diff -Naur ./rockbox.unmod/apps/plugins/zxbox/keymaps.h ./rockbox.mod/apps/plugins/zxbox/keymaps.h
--- ./rockbox.unmod/apps/plugins/zxbox/keymaps.h	2011-01-22 09:02:14.000000000 -0600
+++ ./rockbox.mod/apps/plugins/zxbox/keymaps.h	2011-01-22 22:21:24.000000000 -0600
@@ -216,6 +216,15 @@
 #define ZX_LEFT         BUTTON_REW
 #define ZX_RIGHT        BUTTON_FF
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+
+#define ZX_RIGHT      (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define ZX_LEFT       (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define ZX_UP         (BUTTON_DPAD_UP|BUTTON_REL)
+#define ZX_DOWN       (BUTTON_DPAD_DOWN|BUTTON_REL)
+#define ZX_SELECT     BUTTON_DPAD_CENTER
+#define ZX_MENU       BUTTON_MENU
+
 #else
 #error Keymap not defined!
 
diff -Naur ./rockbox.unmod/apps/plugins/zxbox/zxbox_keyb.c ./rockbox.mod/apps/plugins/zxbox/zxbox_keyb.c
--- ./rockbox.unmod/apps/plugins/zxbox/zxbox_keyb.c	2011-01-22 09:02:14.000000000 -0600
+++ ./rockbox.mod/apps/plugins/zxbox/zxbox_keyb.c	2011-01-22 22:22:35.000000000 -0600
@@ -220,6 +220,15 @@
 #define KBD_UP     BUTTON_UP
 #define KBD_DOWN   BUTTON_DOWN
 
+#elif CONFIG_KEYPAD == ANDROID_PAD
+
+#define KBD_SELECT BUTTON_DPAD_CENTER
+#define KBD_ABORT  BUTTON_BACK
+#define KBD_LEFT   (BUTTON_DPAD_LEFT|BUTTON_REL)
+#define KBD_RIGHT  (BUTTON_DPAD_RIGHT|BUTTON_REL)
+#define KBD_UP     (BUTTON_DPAD_UP|BUTTON_REL)
+#define KBD_DOWN   (BUTTON_DPAD_DOWN|BUTTON_REL)
+
 #endif
 
 #ifdef HAVE_TOUCHSCREEN