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

Commit 9b0bc9ae authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Include current position when setting position for magnified windows"

parents 1c022131 47ef5c44

services/core/java/com/android/server/wm/WindowContainer.java

+3 −2
Original line number Diff line number Diff line
@@ -2639,7 +2639,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
    void applyMagnificationSpec(Transaction t, MagnificationSpec spec) {

        if (shouldMagnify()) {

            t.setMatrix(mSurfaceControl, spec.scale, 0, 0, spec.scale)

                    .setPosition(mSurfaceControl, spec.offsetX, spec.offsetY);

                    .setPosition(mSurfaceControl, spec.offsetX + mLastSurfacePosition.x,

                            spec.offsetY + mLastSurfacePosition.y);

            mLastMagnificationSpec = spec;

        } else {

            clearMagnificationSpec(t);
@@ -2652,7 +2653,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
    void clearMagnificationSpec(Transaction t) {

        if (mLastMagnificationSpec != null) {

            t.setMatrix(mSurfaceControl, 1, 0, 0, 1)

                .setPosition(mSurfaceControl, 0, 0);

                .setPosition(mSurfaceControl, mLastSurfacePosition.x, mLastSurfacePosition.y);

        }

        mLastMagnificationSpec = null;

        for (int i = 0; i < mChildren.size(); i++) {