--- rockbox.svn/firmware/target/hosted/android/button-android.c	2011-01-27 04:37:48.000000000 -0600
+++ rockbox/firmware/target/hosted/android/button-android.c	2011-01-27 04:54:00.000000000 -0600
@@ -69,38 +69,30 @@
 
     unsigned button = 0;
 
-    if (!state)
-    {
-        button = multimedia_to_button((int)keycode);
-        if (!button)
-            button = dpad_to_button((int)keycode);
-        if (button)
-            queue_post(&button_queue, button, 0);
-    }
-
-    if (!button)
-    {   
-        button = key_to_button(keycode);
+        if (state)
+            {
+            button = multimedia_to_button((int)keycode);
+            if (!button)
+            {
+                button = key_to_button(keycode);
+                if (button == BUTTON_NONE)
+            {
+                return false;
+            }
+        }
+    last_btns = button;
+    queue_post(&button_queue, button|BUTTON_REL, 0);
+    return true;
     }
 
-    if (button == BUTTON_NONE)
+    if (!state)
     {
-        last_btns = button;
-        return false;
+        last_btns = BUTTON_REL;
+        return true;
     }
 
-    if (state)
-    {
-        last_btns |= button;
-    }
-    else
-    {
-        last_btns &= (~button);
-        return false;
-    }
-        
-    return true;
-}
+    return false;
+}
 
 void button_init_device(void)
 {
--- rockbox/firmware/target/hosted/android/app/button-application.c	2011-01-26 17:47:30.000000000 -0600
+++ rockbox.mod/firmware/target/hosted/android/app/button-application.c	2011-01-27 00:13:00.000000000 -0600
@@ -39,6 +39,14 @@
             return BUTTON_MENU;
         case KEYCODE_DPAD_CENTER:
             return BUTTON_DPAD_CENTER;
+        case KEYCODE_DPAD_UP:
+            return BUTTON_DPAD_UP;
+        case KEYCODE_DPAD_DOWN:
+            return BUTTON_DPAD_DOWN;
+        case KEYCODE_DPAD_LEFT:
+            return BUTTON_DPAD_LEFT;
+        case KEYCODE_DPAD_RIGHT:
+            return BUTTON_DPAD_RIGHT;
         default:
             return BUTTON_NONE;
     }
@@ -63,26 +71,4 @@
         default:
             return 0;
     }
-}
-
-unsigned dpad_to_button(int keyboard_key)
-{
-    switch (keyboard_key)
-    {
-        /* These buttons only post a single release event.
-         * doing otherwise will cause action.c to lock up waiting for
-         * a release (because android sends press/unpress to us too quickly
-         */
-        case KEYCODE_DPAD_UP:
-            return BUTTON_DPAD_UP|BUTTON_REL;
-        case KEYCODE_DPAD_DOWN:
-            return BUTTON_DPAD_DOWN|BUTTON_REL;
-        case KEYCODE_DPAD_LEFT:
-            return BUTTON_DPAD_LEFT|BUTTON_REL;
-        case KEYCODE_DPAD_RIGHT:
-            return BUTTON_DPAD_RIGHT|BUTTON_REL;
-        default:
-            return BUTTON_NONE;
-    }
-}
-    
+}