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

Commit ab97d6e3 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Revert "Check display id of the last hover window before... 

Merge "DO NOT MERGE: Revert "Check display id of the last hover window before it is cleared"" into tm-qpr-dev
parents 3dd864dd eae6a838

services/inputflinger/dispatcher/InputDispatcher.cpp

+4 −7
Original line number Diff line number Diff line
@@ -4727,14 +4727,11 @@ void InputDispatcher::setInputWindowsLocked( 
    updateWindowHandlesForDisplayLocked(windowInfoHandles, displayId);



    const std::vector<sp<WindowInfoHandle>>& windowHandles = getWindowHandlesLocked(displayId);

    if (mLastHoverWindowHandle) {

        const WindowInfo* lastHoverWindowInfo = mLastHoverWindowHandle->getInfo();

        if (lastHoverWindowInfo->displayId == displayId &&

    if (mLastHoverWindowHandle &&

        std::find(windowHandles.begin(), windowHandles.end(), mLastHoverWindowHandle) ==

                windowHandles.end()) {

        mLastHoverWindowHandle = nullptr;

    }

    }



    std::optional<FocusResolver::FocusChanges> changes =

            mFocusResolver.setInputWindows(displayId, windowHandles);

services/inputflinger/tests/InputDispatcher_test.cpp

+0 −53
Original line number Diff line number Diff line
@@ -2189,59 +2189,6 @@ TEST_F(InputDispatcherTest, HoverEnterMouseClickAndHoverExit) { 
                         ADISPLAY_ID_DEFAULT, 0 /* expectedFlag */);

}



TEST_F(InputDispatcherTest, HoverEnterMoveRemoveWindowsInSecondDisplay) {

    std::shared_ptr<FakeApplicationHandle> application = std::make_shared<FakeApplicationHandle>();

    sp<FakeWindowHandle> windowDefaultDisplay =

            sp<FakeWindowHandle>::make(application, mDispatcher, "DefaultDisplay",

                                       ADISPLAY_ID_DEFAULT);

    windowDefaultDisplay->setFrame(Rect(0, 0, 600, 800));

    sp<FakeWindowHandle> windowSecondDisplay =

            sp<FakeWindowHandle>::make(application, mDispatcher, "SecondDisplay",

                                       SECOND_DISPLAY_ID);

    windowSecondDisplay->setFrame(Rect(0, 0, 600, 800));



    mDispatcher->setInputWindows({{ADISPLAY_ID_DEFAULT, {windowDefaultDisplay}},

                                  {SECOND_DISPLAY_ID, {windowSecondDisplay}}});



    // Set cursor position in window in default display and check that hover enter and move

    // events are generated.

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionEvent(mDispatcher,

                                MotionEventBuilder(AMOTION_EVENT_ACTION_HOVER_MOVE,

                                                   AINPUT_SOURCE_MOUSE)

                                        .displayId(ADISPLAY_ID_DEFAULT)

                                        .pointer(PointerBuilder(0, AMOTION_EVENT_TOOL_TYPE_MOUSE)

                                                         .x(300)

                                                         .y(600))

                                        .build()));

    windowDefaultDisplay->consumeEvent(AINPUT_EVENT_TYPE_MOTION, AMOTION_EVENT_ACTION_HOVER_ENTER,

                                       ADISPLAY_ID_DEFAULT, 0 /* expectedFlag */);

    windowDefaultDisplay->consumeEvent(AINPUT_EVENT_TYPE_MOTION, AMOTION_EVENT_ACTION_HOVER_MOVE,

                                       ADISPLAY_ID_DEFAULT, 0 /* expectedFlag */);



    // Remove all windows in secondary display and check that no event happens on window in

    // primary display.

    mDispatcher->setInputWindows({{SECOND_DISPLAY_ID, {}}});

    windowDefaultDisplay->assertNoEvents();



    // Move cursor position in window in default display and check that only hover move

    // event is generated and not hover enter event.

    mDispatcher->setInputWindows({{ADISPLAY_ID_DEFAULT, {windowDefaultDisplay}},

                                  {SECOND_DISPLAY_ID, {windowSecondDisplay}}});

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionEvent(mDispatcher,

                                MotionEventBuilder(AMOTION_EVENT_ACTION_HOVER_MOVE,

                                                   AINPUT_SOURCE_MOUSE)

                                        .displayId(ADISPLAY_ID_DEFAULT)

                                        .pointer(PointerBuilder(0, AMOTION_EVENT_TOOL_TYPE_MOUSE)

                                                         .x(400)

                                                         .y(700))

                                        .build()));

    windowDefaultDisplay->consumeEvent(AINPUT_EVENT_TYPE_MOTION, AMOTION_EVENT_ACTION_HOVER_MOVE,

                                       ADISPLAY_ID_DEFAULT, 0 /* expectedFlag */);

    windowDefaultDisplay->assertNoEvents();

}



TEST_F(InputDispatcherTest, DispatchMouseEventsUnderCursor) {

    std::shared_ptr<FakeApplicationHandle> application = std::make_shared<FakeApplicationHandle>();