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

Commit 5fc5597b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Magnifier position updates" into sc-dev am: 400dc92e 

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

Change-Id: I2a190086d75790d8f00a332c9b709c4014d4445d
parents 64df6f4a 400dc92e

core/java/android/widget/Magnifier.java

+16 −4
Original line number Diff line number Diff line
@@ -939,6 +939,7 @@ public final class Magnifier { 
        // The surface we allocate for the magnifier content + shadow.

        private final SurfaceSession mSurfaceSession;

        private final SurfaceControl mSurfaceControl;

        private final SurfaceControl mBbqSurfaceControl;

        private final BLASTBufferQueue mBBQ;

        private final SurfaceControl.Transaction mTransaction = new SurfaceControl.Transaction();

        private final Surface mSurface;
@@ -1008,11 +1009,19 @@ public final class Magnifier { 
            mSurfaceControl = new SurfaceControl.Builder(mSurfaceSession)

                    .setName("magnifier surface")

                    .setFlags(SurfaceControl.HIDDEN)

                    .setBLASTLayer()

                    .setContainerLayer()

                    .setParent(parentSurfaceControl)

                    .setCallsite("InternalPopupWindow")

                    .build();

            mBBQ = new BLASTBufferQueue("magnifier surface", mSurfaceControl,

            mBbqSurfaceControl = new SurfaceControl.Builder(mSurfaceSession)

                    .setName("magnifier surface bbq wrapper")

                    .setHidden(false)

                    .setBLASTLayer()

                    .setParent(mSurfaceControl)

                    .setCallsite("InternalPopupWindow")

                    .build();



            mBBQ = new BLASTBufferQueue("magnifier surface", mBbqSurfaceControl,

                surfaceWidth, surfaceHeight, PixelFormat.TRANSLUCENT);

            mSurface = mBBQ.createSurface();
@@ -1073,7 +1082,7 @@ public final class Magnifier { 
            }

            if (mContentHeight < contentHeight) {

                // Grows the surface height as necessary.

                mBBQ.update(mSurfaceControl, mContentWidth, contentHeight,

                mBBQ.update(mBbqSurfaceControl, mContentWidth, contentHeight,

                    PixelFormat.TRANSLUCENT);

                mRenderer.setSurface(mSurface);
@@ -1270,7 +1279,10 @@ public final class Magnifier { 
            mRenderer.destroy();

            mSurface.destroy();

            mBBQ.destroy();

            new SurfaceControl.Transaction().remove(mSurfaceControl).apply();

            new SurfaceControl.Transaction()

                    .remove(mSurfaceControl)

                    .remove(mBbqSurfaceControl)

                    .apply();

            mSurfaceSession.kill();

            mHandler.removeCallbacks(mMagnifierUpdater);

            if (mBitmap != null) {