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

Commit 2ceccac3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove temporary workaround for ignoring skip-screenshot on cursor" into main

parents bab6daa0 0ec5239d

libs/input/MouseCursorController.cpp

+1 −14
Original line number Diff line number Diff line
@@ -175,10 +175,6 @@ void MouseCursorController::setSkipScreenshot(bool skip) { 
    if (mLocked.skipScreenshot == skip) {

        return;

    }

    ALOGW_IF(InputFlags::doNotUseSkipScreenshotFlagForMouseCursor() &&

                     mLocked.viewport.displayId != ui::LogicalDisplayId::DEFAULT &&

                     mLocked.skipScreenshot,

             "SkipScreenshot will be ignored for display: %d", mLocked.viewport.displayId.val());

    mLocked.skipScreenshot = skip;

    updatePointerLocked();

}
@@ -373,16 +369,7 @@ void MouseCursorController::updatePointerLocked() REQUIRES(mLock) { 
    mLocked.pointerSprite->setLayer(Sprite::BASE_LAYER_POINTER);

    mLocked.pointerSprite->setPosition(mLocked.pointerPosition.x, mLocked.pointerPosition.y);

    mLocked.pointerSprite->setDisplayId(mLocked.viewport.displayId);

    if (InputFlags::doNotUseSkipScreenshotFlagForMouseCursor() &&

        mLocked.viewport.displayId != ui::LogicalDisplayId::DEFAULT) {

        //  This is a temporary workaround to avoid b/418143858.

        // TODO(b/412777943): At present the SKIP_SCREENSHOT flag causes layers to be excluded from

        //  all external-displays. On connected display this causes cursor to be hidden on external

        //  displays.

        mLocked.pointerSprite->setSkipScreenshot(false);

    } else {

    mLocked.pointerSprite->setSkipScreenshot(mLocked.skipScreenshot);

    }



    if (mLocked.pointerAlpha > 0) {

        mLocked.pointerSprite->setAlpha(mLocked.pointerAlpha);