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

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

Merge "Remove conflict window crop" into tm-dev am: 3fa5b533 

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



Change-Id: Id402652dbea7f6cabdadf4c0b9982935d61dda8c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3099215b 3fa5b533

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

+0 −3
Original line number Diff line number Diff line
@@ -134,9 +134,6 @@ public abstract class PipContentOverlay { 
            tx.setBuffer(mLeash, mSnapshot.getHardwareBuffer());

            // Relocate the content to parentLeash's coordinates.

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

            tx.setWindowCrop(mLeash,

                    (int) (mSourceRectHint.width() * mTaskSnapshotScaleX),

                    (int) (mSourceRectHint.height() * mTaskSnapshotScaleY));

            tx.setScale(mLeash, mTaskSnapshotScaleX, mTaskSnapshotScaleY);

            tx.reparent(mLeash, parentLeash);

            tx.apply();