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

Commit f35573ce authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Android (Google) Code Review
Browse files

Merge "Replace ADISPLAY_ID_ constants with LogicalDisplayId equivalents" into main

parents 0a30dd85 445af18b

core/jni/platform/host/HostRuntime.cpp

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static void init_keyboard(JNIEnv* env, const vector<string>& keyboardPaths) { 
        InputDeviceInfo info = InputDeviceInfo();

        info.initialize(keyboardId, 0, 0, InputDeviceIdentifier(),

                        "keyboard " + std::to_string(keyboardId), true, false,

                        ui::ADISPLAY_ID_DEFAULT);

                        ui::LogicalDisplayId::DEFAULT);

        info.setKeyboardType(AINPUT_KEYBOARD_TYPE_ALPHABETIC);

        info.setKeyCharacterMap(*charMap);

libs/input/MouseCursorController.cpp

+2 −2
Original line number Diff line number Diff line
@@ -467,10 +467,10 @@ void MouseCursorController::startAnimationLocked() REQUIRES(mLock) { 


    std::function<bool(nsecs_t)> func = std::bind(&MouseCursorController::doAnimations, this, _1);

    /*

     * Using ui::ADISPLAY_ID_NONE for displayId here to avoid removing the callback

     * Using ui::LogicalDisplayId::INVALID for displayId here to avoid removing the callback

     * if a TouchSpotController with the same display is removed.

     */

    mContext.addAnimationCallback(ui::ADISPLAY_ID_NONE, func);

    mContext.addAnimationCallback(ui::LogicalDisplayId::INVALID, func);

}



} // namespace android

libs/input/PointerController.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ private: 


    struct Locked {

        Presentation presentation;

        ui::LogicalDisplayId pointerDisplayId = ui::ADISPLAY_ID_NONE;

        ui::LogicalDisplayId pointerDisplayId = ui::LogicalDisplayId::INVALID;



        std::vector<gui::DisplayInfo> mDisplayInfos;

        std::unordered_map<ui::LogicalDisplayId, TouchSpotController> spotControllers;

libs/input/SpriteController.h

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ private: 
        int32_t layer{0};

        float alpha{1.0f};

        SpriteTransformationMatrix transformationMatrix;

        ui::LogicalDisplayId displayId{ui::ADISPLAY_ID_DEFAULT};

        ui::LogicalDisplayId displayId{ui::LogicalDisplayId::DEFAULT};



        sp<SurfaceControl> surfaceControl;

        int32_t surfaceWidth{0};

libs/input/tests/PointerController_test.cpp

+6 −6
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ protected: 
    PointerControllerTest();

    ~PointerControllerTest();



    void ensureDisplayViewportIsSet(ui::LogicalDisplayId displayId = ui::ADISPLAY_ID_DEFAULT);

    void ensureDisplayViewportIsSet(ui::LogicalDisplayId displayId = ui::LogicalDisplayId::DEFAULT);



    sp<MockSprite> mPointerSprite;

    sp<MockPointerControllerPolicyInterface> mPolicy;
@@ -335,23 +335,23 @@ TEST_F(PointerControllerTest, updatesSkipScreenshotFlagForTouchSpots) { 


    // Update spots to sync state with sprite

    mPointerController->setSpots(&testSpotCoords, testIdToIndex.cbegin(), testIdBits,

                                 ui::ADISPLAY_ID_DEFAULT);

                                 ui::LogicalDisplayId::DEFAULT);

    testing::Mock::VerifyAndClearExpectations(testSpotSprite.get());



    // Marking the display to skip screenshot should update sprite as well

    mPointerController->setSkipScreenshot(ui::ADISPLAY_ID_DEFAULT, true);

    mPointerController->setSkipScreenshot(ui::LogicalDisplayId::DEFAULT, true);

    EXPECT_CALL(*testSpotSprite, setSkipScreenshot).With(testing::Args<0>(true));



    // Update spots to sync state with sprite

    mPointerController->setSpots(&testSpotCoords, testIdToIndex.cbegin(), testIdBits,

                                 ui::ADISPLAY_ID_DEFAULT);

                                 ui::LogicalDisplayId::DEFAULT);

    testing::Mock::VerifyAndClearExpectations(testSpotSprite.get());



    // Reset flag and verify again

    mPointerController->setSkipScreenshot(ui::ADISPLAY_ID_DEFAULT, false);

    mPointerController->setSkipScreenshot(ui::LogicalDisplayId::DEFAULT, false);

    EXPECT_CALL(*testSpotSprite, setSkipScreenshot).With(testing::Args<0>(false));

    mPointerController->setSpots(&testSpotCoords, testIdToIndex.cbegin(), testIdBits,

                                 ui::ADISPLAY_ID_DEFAULT);

                                 ui::LogicalDisplayId::DEFAULT);

    testing::Mock::VerifyAndClearExpectations(testSpotSprite.get());

}