aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kdab.com>2016-02-14 15:24:57 +0200
committerBogDan Vatra <bogdan@kdab.com>2016-02-15 07:30:31 +0000
commit13774ef2097987c6cf6ea1f5e7a85c7b61ac3f32 (patch)
treeff6f02dc8385b00d6135a6aaec5ba722ebbecfe4
parent71e574166099203c21cb3bb9072d3d02e827c303 (diff)
Android: Don't add SOURCE_DPAD on Android API-12+
SOURCE_DPAD is used by non-gamepad devices (e.g. remote controls) to send key events. We don't need to add them to our gampad list if the O.S. knows gamepads. Change-Id: I36ac1187f6d18e279e0b1cc431a7a55448ce61de Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
-rw-r--r--src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp
index a2c93a5..9fbd2b5 100644
--- a/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp
+++ b/src/plugins/gamepads/android/src/qandroidgamepadbackend.cpp
@@ -148,13 +148,14 @@ namespace {
allAndroidAxes.push_back(motionField("AXIS_WHEEL"));
}
- acceptedSources.push_back(inputDeviceField("SOURCE_DPAD"));
if (QtAndroidPrivate::androidSdkVersion() >= 12) {
acceptedSources.push_back(inputDeviceField("SOURCE_GAMEPAD"));
acceptedSources.push_back(inputDeviceField("SOURCE_CLASS_JOYSTICK"));
if (QtAndroidPrivate::androidSdkVersion() >= 21) {
acceptedSources.push_back(inputDeviceField("SOURCE_HDMI"));
}
+ } else {
+ acceptedSources.push_back(inputDeviceField("SOURCE_DPAD"));
}
ACTION_DOWN = keyField("ACTION_DOWN");