Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "modify the device to enable to get the state as slide-open/slide-close."

Browse Source
This commit is contained in:
Conley Owens
2011-04-29 09:59:42 -07:00
committed by Android Code Review
parent 69ef0d55d7 9001176193
commit 1ecd0a9b28
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ui/InputReader.cpp
View File

@@ -547,9 +547,9 @@ int32_t InputReader::getState(int32_t deviceId, uint32_t sourceMask, int32_t cod
for (size_t i = 0; i < numDevices; i++) { for (size_t i = 0; i < numDevices; i++) {
InputDevice* device = mDevices.valueAt(i); InputDevice* device = mDevices.valueAt(i);
if (! device->isIgnored() && sourcesMatchMask(device->getSources(), sourceMask)) { if (! device->isIgnored() && sourcesMatchMask(device->getSources(), sourceMask)) {
result = (device->*getStateFunc)(sourceMask, code); int32_t state = (device->*getStateFunc)(sourceMask, code);
if (result >= AKEY_STATE_DOWN) { if (state > result) {
return result; result = state;
} }
} }
} }
@@ -737,9 +737,9 @@ int32_t InputDevice::getState(uint32_t sourceMask, int32_t code, GetStateFunc ge
for (size_t i = 0; i < numMappers; i++) { for (size_t i = 0; i < numMappers; i++) {
InputMapper* mapper = mMappers[i]; InputMapper* mapper = mMappers[i];
if (sourcesMatchMask(mapper->getSources(), sourceMask)) { if (sourcesMatchMask(mapper->getSources(), sourceMask)) {
result = (mapper->*getStateFunc)(sourceMask, code); int32_t state = (mapper->*getStateFunc)(sourceMask, code);
if (result >= AKEY_STATE_DOWN) { if (state > result) {
return result; result = state;
} }
} }
} }