From 90011761938e16c22709042c7021ae9b3445a307 Mon Sep 17 00:00:00 2001 From: nao Date: Wed, 30 Mar 2011 15:39:12 +0900 Subject: modify the device to enable to get the state as slide-open/slide-close. This modify is for the devices which have a slidable H/W keyboard with backlight. For example of current issues: - Backlight of H/W keyboard doesn't turn on when the device starts up with slide-open. - Home screen doesn't display with proper orientation when the device starts up with slide-open. Change-Id: I6a6a18d0b09d0ba484ca992c9fb34f24de9bf21b --- libs/ui/InputReader.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp index 34e44e4..336d489 100644 --- a/libs/ui/InputReader.cpp +++ b/libs/ui/InputReader.cpp @@ -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; } } } -- cgit v1.1