From 04afd61cd9b270e12be187c4d0040aac6cd790ea Mon Sep 17 00:00:00 2001
From: Gabriel Jacobo <gabomdq@gmail.com>
Date: Mon, 11 Nov 2013 11:12:43 -0300
Subject: [PATCH] [Android] Try to improve handling of some
 dpad+gamepad+keyboard corner cases

---
 android-project/src/org/libsdl/app/SDLActivity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
index 7c7d63c811cb1..54670f8df3be9 100755
--- a/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/android-project/src/org/libsdl/app/SDLActivity.java
@@ -612,10 +612,11 @@ public boolean onKey(View  v, int keyCode, KeyEvent event) {
                 } else if (event.getAction() == KeyEvent.ACTION_UP) {
                     SDLActivity.onNativePadUp(id, keyCode);
                 }
+                return true;
             }
-            return true;
         }
-        else if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
+        
+        if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
             if (event.getAction() == KeyEvent.ACTION_DOWN) {
                 //Log.v("SDL", "key down: " + keyCode);
                 SDLActivity.onNativeKeyDown(keyCode);