summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-09-16 13:05:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-16 13:05:50 -0700
commit707929d6f8f8ff2663da9982a99f943736b8be5c (patch)
treec68c3251dc53422c136ab6ec239033b60ec32e33 /libs
parent6cca469ed6e58444dc6264a353510250cacfcf09 (diff)
parent61cf67a220ba3205737c646c1c836a92074220de (diff)
downloadframeworks_base-707929d6f8f8ff2663da9982a99f943736b8be5c.zip
frameworks_base-707929d6f8f8ff2663da9982a99f943736b8be5c.tar.gz
frameworks_base-707929d6f8f8ff2663da9982a99f943736b8be5c.tar.bz2
am 61cf67a2: am 24326f72: Merge "Input API review." into gingerbread
Merge commit '61cf67a220ba3205737c646c1c836a92074220de' * commit '61cf67a220ba3205737c646c1c836a92074220de': Input API review.
Diffstat (limited to 'libs')
-rw-r--r--libs/ui/InputReader.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp
index 88084c0..783cbc4 100644
--- a/libs/ui/InputReader.cpp
+++ b/libs/ui/InputReader.cpp
@@ -325,9 +325,6 @@ InputDevice* InputReader::createDevice(int32_t deviceId, const String8& name, ui
if (classes & INPUT_DEVICE_CLASS_DPAD) {
keyboardSources |= AINPUT_SOURCE_DPAD;
}
- if (classes & INPUT_DEVICE_CLASS_GAMEPAD) {
- keyboardSources |= AINPUT_SOURCE_GAMEPAD;
- }
if (keyboardSources != 0) {
device->addMapper(new KeyboardInputMapper(device,