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

Commit 1eb06c3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use ui::Rotation in libgui calls"

parents 6a10c36e 2a3d9aae

cmds/bootanimation/BootAnimation.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1113,7 +1113,7 @@ void BootAnimation::handleViewport(nsecs_t timestep) { 
        SurfaceComposerClient::Transaction t;

        SurfaceComposerClient::Transaction t;

        t.setPosition(mFlingerSurfaceControl, 0, -mTargetInset)

        t.setPosition(mFlingerSurfaceControl, 0, -mTargetInset)

                .setCrop(mFlingerSurfaceControl, Rect(0, mTargetInset, mWidth, mHeight));

                .setCrop(mFlingerSurfaceControl, Rect(0, mTargetInset, mWidth, mHeight));

        t.setDisplayProjection(mDisplayToken, 0 /* orientation */, layerStackRect, displayRect);

        t.setDisplayProjection(mDisplayToken, ui::ROTATION_0, layerStackRect, displayRect);

        t.apply();

        t.apply();





        mTargetInset = mCurrentInset = 0;

        mTargetInset = mCurrentInset = 0;

core/jni/android_view_SurfaceControl.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -263,7 +263,8 @@ static jobject nativeScreenshot(JNIEnv* env, jclass clazz, 
    status_t res = ScreenshotClient::capture(displayToken, dataspace,

    status_t res = ScreenshotClient::capture(displayToken, dataspace,

            ui::PixelFormat::RGBA_8888,

            ui::PixelFormat::RGBA_8888,

            sourceCrop, width, height,

            sourceCrop, width, height,

            useIdentityTransform, rotation, captureSecureLayers, &buffer, capturedSecureLayers);

            useIdentityTransform, ui::toRotation(rotation),

            captureSecureLayers, &buffer, capturedSecureLayers);

    if (res != NO_ERROR) {

    if (res != NO_ERROR) {

        return NULL;

        return NULL;

    }

    }
@@ -724,7 +725,8 @@ static void nativeSetDisplayProjection(JNIEnv* env, jclass clazz, 




    {

    {

        auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);

        auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);

        transaction->setDisplayProjection(token, orientation, layerStackRect, displayRect);

        transaction->setDisplayProjection(token, static_cast<ui::Rotation>(orientation),

                                          layerStackRect, displayRect);

    }

    }

}

}

libs/hwui/tests/common/TestContext.cpp

+10 −10
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ static android::DisplayInfo DUMMY_DISPLAY{ 
        320.0,          // ydpi

        320.0,          // ydpi

        60.0,           // fps

        60.0,           // fps

        2.0,            // density

        2.0,            // density

        0,      // orientation

        ui::ROTATION_0, // orientation

        false,          // secure?

        false,          // secure?

        0,              // appVsyncOffset

        0,              // appVsyncOffset

        0,              // presentationDeadline

        0,              // presentationDeadline