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

Commit 55605c9e authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1

parents 06a0c9f5 924c4d47

services/input/InputDispatcher.cpp

+15 −0
Original line number Diff line number Diff line
@@ -2245,6 +2245,21 @@ void InputDispatcher::notifyKey(nsecs_t eventTime, int32_t deviceId, uint32_t so 
        policyFlags |= POLICY_FLAG_VIRTUAL;

        flags |= AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY;

    }

    if (policyFlags & POLICY_FLAG_ALT) {

        metaState |= AMETA_ALT_ON | AMETA_ALT_LEFT_ON;

    }

    if (policyFlags & POLICY_FLAG_ALT_GR) {

        metaState |= AMETA_ALT_ON | AMETA_ALT_RIGHT_ON;

    }

    if (policyFlags & POLICY_FLAG_SHIFT) {

        metaState |= AMETA_SHIFT_ON | AMETA_SHIFT_LEFT_ON;

    }

    if (policyFlags & POLICY_FLAG_CAPS_LOCK) {

        metaState |= AMETA_CAPS_LOCK_ON;

    }

    if (policyFlags & POLICY_FLAG_FUNCTION) {

        metaState |= AMETA_FUNCTION_ON;

    }



    policyFlags |= POLICY_FLAG_TRUSTED;

services/input/InputReader.cpp

+0 −3
Original line number Diff line number Diff line
@@ -1009,9 +1009,6 @@ void KeyboardInputMapper::processKey(nsecs_t when, bool down, int32_t keyCode, 
        getContext()->fadePointer();

    }



    if (policyFlags & POLICY_FLAG_FUNCTION) {

        newMetaState |= AMETA_FUNCTION_ON;

    }

    getDispatcher()->notifyKey(when, getDeviceId(), mSources, policyFlags,

            down ? AKEY_EVENT_ACTION_DOWN : AKEY_EVENT_ACTION_UP,

            AKEY_EVENT_FLAG_FROM_SYSTEM, keyCode, scanCode, newMetaState, downTime);