Reverted changes a970b2ae1bd7 and 4a94743e31fe
authorSam Lantinga <slouken@libsdl.org>
Fri, 20 Oct 2017 10:29:22 -0700
changeset 116382393519f642e
parent 11637 a970b2ae1bd7
child 11639 b72de18f13ce
Reverted changes a970b2ae1bd7 and 4a94743e31fe
I don't want to introduce any regressions with Android TV remote support
android-project/src/org/libsdl/app/SDLControllerManager.java
     1.1 --- a/android-project/src/org/libsdl/app/SDLControllerManager.java	Thu Oct 19 15:37:52 2017 -0700
     1.2 +++ b/android-project/src/org/libsdl/app/SDLControllerManager.java	Fri Oct 20 10:29:22 2017 -0700
     1.3 @@ -92,16 +92,15 @@
     1.4          if ((sources & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK) {
     1.5              Log.v(TAG, "Input device " + device.getName() + " is a joystick.");
     1.6          }
     1.7 -        /* A lot of things are a DPAD that we don't want to use as a joystick (e.g. gpio input, etc.)
     1.8          if ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) {
     1.9              Log.v(TAG, "Input device " + device.getName() + " is a dpad.");
    1.10          }
    1.11 -        */
    1.12          if ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD) {
    1.13              Log.v(TAG, "Input device " + device.getName() + " is a gamepad.");
    1.14          }
    1.15  
    1.16          return (((sources & InputDevice.SOURCE_CLASS_JOYSTICK) == InputDevice.SOURCE_CLASS_JOYSTICK) ||
    1.17 +                ((sources & InputDevice.SOURCE_DPAD) == InputDevice.SOURCE_DPAD) ||
    1.18                  ((sources & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD)
    1.19          );
    1.20      }