ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit '1ecd0a9b28f8d608cac1a1db6c9bd493ace0ca3e':
  modify the device to enable to get the state as slide-open/slide-close.
This commit is contained in:
Conley Owens 2011-04-29 10:23:53 -07:00 committed by Android Git Automerger
commit 3b6b23e1ca
1 changed files with 6 additions and 6 deletions
Show Stats 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++) {
InputDevice* device = mDevices.valueAt(i);
if (! device->isIgnored() && sourcesMatchMask(device->getSources(), sourceMask)) {
result = (device->*getStateFunc)(sourceMask, code);
if (result >= AKEY_STATE_DOWN) {
return result;
int32_t state = (device->*getStateFunc)(sourceMask, code);
if (state > 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++) {
InputMapper* mapper = mMappers[i];
if (sourcesMatchMask(mapper->getSources(), sourceMask)) {
result = (mapper->*getStateFunc)(sourceMask, code);
if (result >= AKEY_STATE_DOWN) {
return result;
int32_t state = (mapper->*getStateFunc)(sourceMask, code);
if (state > result) {
result = state;
}
}
}