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

Commit cd2ea040 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix flicker at the end of content PiP animation" into tm-qpr-dev am: 9d16d9da 

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



Change-Id: I8bce90d8e45fe0f9c63aaa402e9366dd01ead84f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d1c185f 9d16d9da

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipContentOverlay.java

+3 −20
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ public abstract class PipContentOverlay { 
        private final TaskSnapshot mSnapshot;

        private final Rect mSourceRectHint;



        private float mTaskSnapshotScaleX;

        private float mTaskSnapshotScaleY;



        public PipSnapshotOverlay(TaskSnapshot snapshot, Rect sourceRectHint) {

            mSnapshot = snapshot;

            mSourceRectHint = new Rect(sourceRectHint);
@@ -125,16 +122,16 @@ public abstract class PipContentOverlay { 


        @Override

        public void attach(SurfaceControl.Transaction tx, SurfaceControl parentLeash) {

            mTaskSnapshotScaleX = (float) mSnapshot.getTaskSize().x

            final float taskSnapshotScaleX = (float) mSnapshot.getTaskSize().x

                    / mSnapshot.getHardwareBuffer().getWidth();

            mTaskSnapshotScaleY = (float) mSnapshot.getTaskSize().y

            final float taskSnapshotScaleY = (float) mSnapshot.getTaskSize().y

                    / mSnapshot.getHardwareBuffer().getHeight();

            tx.show(mLeash);

            tx.setLayer(mLeash, Integer.MAX_VALUE);

            tx.setBuffer(mLeash, mSnapshot.getHardwareBuffer());

            // Relocate the content to parentLeash's coordinates.

            tx.setPosition(mLeash, -mSourceRectHint.left, -mSourceRectHint.top);

            tx.setScale(mLeash, mTaskSnapshotScaleX, mTaskSnapshotScaleY);

            tx.setScale(mLeash, taskSnapshotScaleX, taskSnapshotScaleY);

            tx.reparent(mLeash, parentLeash);

            tx.apply();

        }
@@ -146,20 +143,6 @@ public abstract class PipContentOverlay { 


        @Override

        public void onAnimationEnd(SurfaceControl.Transaction atomicTx, Rect destinationBounds) {

            // Work around to make sure the snapshot overlay is aligned with PiP window before

            // the atomicTx is committed along with the final WindowContainerTransaction.

            final SurfaceControl.Transaction nonAtomicTx = new SurfaceControl.Transaction();

            final float scaleX = (float) destinationBounds.width()

                    / mSourceRectHint.width();

            final float scaleY = (float) destinationBounds.height()

                    / mSourceRectHint.height();

            final float scale = Math.max(

                    scaleX * mTaskSnapshotScaleX, scaleY * mTaskSnapshotScaleY);

            nonAtomicTx.setScale(mLeash, scale, scale);

            nonAtomicTx.setPosition(mLeash,

                    -scale * mSourceRectHint.left / mTaskSnapshotScaleX,

                    -scale * mSourceRectHint.top / mTaskSnapshotScaleY);

            nonAtomicTx.apply();

            atomicTx.remove(mLeash);

        }

    }