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

Commit 1eb587b9 authored by Kevin Schoedel's avatar Kevin Schoedel
Browse files

Switch touch input device on hover events. 

On a phone in a Mirage headset, two touch nubs are in continuous
contact with the screen while in VR. In order to pass virtual
touchpad events to embedded 2D content that is confined to the
physical display (e.g. permission dialogues), allow a hover event
(as generated for the user's controller pointer) to initiate a
new event.

Bug: 36686408
Test: manual on device
Change-Id: I868472721599843b183b2615aac8e6cd87a58e8e
parent 8bba03d3

services/inputflinger/InputDispatcher.cpp

+11 −1
Original line number Diff line number Diff line
@@ -1172,10 +1172,11 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
    bool wrongDevice = false;

    if (newGesture) {

        bool down = maskedAction == AMOTION_EVENT_ACTION_DOWN;

        if (switchedDevice && mTempTouchState.down && !down) {

        if (switchedDevice && mTempTouchState.down && !down && !isHoverAction) {

#if DEBUG_FOCUS

            ALOGD("Dropping event because a pointer for a different device is already down.");

#endif

            // TODO: test multiple simultaneous input streams.

            injectionResult = INPUT_EVENT_INJECTION_FAILED;

            switchedDevice = false;

            wrongDevice = true;
@@ -1187,6 +1188,15 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
        mTempTouchState.source = entry->source;

        mTempTouchState.displayId = displayId;

        isSplit = false;

    } else if (switchedDevice && maskedAction == AMOTION_EVENT_ACTION_MOVE) {

#if DEBUG_FOCUS

        ALOGI("Dropping move event because a pointer for a different device is already active.");

#endif

        // TODO: test multiple simultaneous input streams.

        injectionResult = INPUT_EVENT_INJECTION_PERMISSION_DENIED;

        switchedDevice = false;

        wrongDevice = true;

        goto Failed;

    }



    if (newGesture || (isSplit && maskedAction == AMOTION_EVENT_ACTION_POINTER_DOWN)) {