diff options
author | hcdrjacob <jacobcrawley@gmail.com> | 2011-05-13 14:37:52 -0400 |
---|---|---|
committer | hcdrjacob <jacobcrawley@gmail.com> | 2011-05-13 14:37:52 -0400 |
commit | 7cc414c564c8365f2d3190dc6d9456aa4e5a6ba3 (patch) | |
tree | bbfa295a0d665aa376c34f4b1eaac5bc27ac048e | |
parent | 0867a021ae4103b1a7fbe3a0fbfc355ab2562c9d (diff) | |
download | frameworks_base-7cc414c564c8365f2d3190dc6d9456aa4e5a6ba3.zip frameworks_base-7cc414c564c8365f2d3190dc6d9456aa4e5a6ba3.tar.gz frameworks_base-7cc414c564c8365f2d3190dc6d9456aa4e5a6ba3.tar.bz2 |
Revert "modify the device to enable to get the state as slide-open/slide-close."
This reverts commit f631d5f85790b16ea5158879fa0f78554db10b67.
-rw-r--r-- | libs/ui/InputReader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp index df647e3..92249ba 100644 --- a/libs/ui/InputReader.cpp +++ b/libs/ui/InputReader.cpp @@ -552,9 +552,9 @@ int32_t InputReader::getState(int32_t deviceId, uint32_t sourceMask, int32_t cod for (size_t i = 0; i < numDevices; i++) { InputDevice* device = mDevices.valueAt(i); if (! device->isIgnored() && sourcesMatchMask(device->getSources(), sourceMask)) { - int32_t state = (device->*getStateFunc)(sourceMask, code); - if (state > result) { - result = state; + result = (device->*getStateFunc)(sourceMask, code); + if (result >= AKEY_STATE_DOWN) { + return result; } } } @@ -742,9 +742,9 @@ int32_t InputDevice::getState(uint32_t sourceMask, int32_t code, GetStateFunc ge for (size_t i = 0; i < numMappers; i++) { InputMapper* mapper = mMappers[i]; if (sourcesMatchMask(mapper->getSources(), sourceMask)) { - int32_t state = (mapper->*getStateFunc)(sourceMask, code); - if (state > result) { - result = state; + result = (mapper->*getStateFunc)(sourceMask, code); + if (result >= AKEY_STATE_DOWN) { + return result; } } } |