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

Commit 380c52a8 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Automerger Merge Worker
Browse files

Merge "Add test for HOVER_EXIT when another device is touched" into udc-dev am: 2a8ad28b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21532275



Change-Id: I1c21170a5328187024db2a656388e1da855e460c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60b85464 2a8ad28b

services/inputflinger/tests/InputDispatcher_test.cpp

+37 −1
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ TEST_F(InputDispatcherTest, MixedTouchAndMouseWithPointerDown) { 
    const int32_t mouseDeviceId = 6;

    NotifyMotionArgs args;



    // First touch pointer down on right window

    // First touch pointer down

    mDispatcher->notifyMotion(&(

            args = MotionArgsBuilder(ACTION_DOWN, AINPUT_SOURCE_TOUCHSCREEN)

                           .deviceId(touchDeviceId)
@@ -3490,6 +3490,42 @@ TEST_F(InputDispatcherTest, HoverExitIsSentToRemovedWindow) { 
    window->consumeMotionEvent(WithMotionAction(AMOTION_EVENT_ACTION_HOVER_EXIT));

}



/**

 * If mouse is hovering when the touch goes down, the hovering should be stopped via HOVER_EXIT.

 */

TEST_F(InputDispatcherTest, TouchDownAfterMouseHover) {

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

    sp<FakeWindowHandle> window =

            sp<FakeWindowHandle>::make(application, mDispatcher, "Window", ADISPLAY_ID_DEFAULT);

    window->setFrame(Rect(0, 0, 100, 100));



    mDispatcher->setInputWindows({{ADISPLAY_ID_DEFAULT, {window}}});



    const int32_t mouseDeviceId = 7;

    const int32_t touchDeviceId = 4;

    NotifyMotionArgs args;



    // Start hovering with the mouse

    mDispatcher->notifyMotion(

            &(args = MotionArgsBuilder(ACTION_HOVER_ENTER, AINPUT_SOURCE_MOUSE)

                             .deviceId(mouseDeviceId)

                             .pointer(PointerBuilder(0, AMOTION_EVENT_TOOL_TYPE_MOUSE).x(10).y(10))

                             .build()));

    window->consumeMotionEvent(

            AllOf(WithMotionAction(ACTION_HOVER_ENTER), WithDeviceId(mouseDeviceId)));



    // Touch goes down

    mDispatcher->notifyMotion(

            &(args = MotionArgsBuilder(ACTION_DOWN, AINPUT_SOURCE_TOUCHSCREEN)

                             .deviceId(touchDeviceId)

                             .pointer(PointerBuilder(0, AMOTION_EVENT_TOOL_TYPE_FINGER).x(50).y(50))

                             .build()));



    window->consumeMotionEvent(

            AllOf(WithMotionAction(ACTION_HOVER_EXIT), WithDeviceId(mouseDeviceId)));

    window->consumeMotionEvent(AllOf(WithMotionAction(ACTION_DOWN), WithDeviceId(touchDeviceId)));

}



/**

 * Inject a mouse hover event followed by a tap from touchscreen.

 * The tap causes a HOVER_EXIT event to be generated because the current event