Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f52819e authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Revert "Revert "modify the device to enable to get the state as... 

Merge "Revert "Revert "modify the device to enable to get the state as slide-open/slide-close.""" into gingerbread
parents e7828805 977880e6

libs/ui/InputReader.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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)) {

                    result = (device->*getStateFunc)(sourceMask, code);

                    if (result >= AKEY_STATE_DOWN) {

                        return result;

                    int32_t state = (device->*getStateFunc)(sourceMask, code);

                    if (state > result) {

                        result = state;

                    }

                }

            }
@@ -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)) {

            result = (mapper->*getStateFunc)(sourceMask, code);

            if (result >= AKEY_STATE_DOWN) {

                return result;

            int32_t state = (mapper->*getStateFunc)(sourceMask, code);

            if (state > result) {

                result = state;

            }

        }

    }