Merge "Remove conflict window crop" into tm-dev am: 3fa5b5332b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18717099 Change-Id: Id402652dbea7f6cabdadf4c0b9982935d61dda8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -134,9 +134,6 @@ public abstract class PipContentOverlay {
|
|||||||
tx.setBuffer(mLeash, mSnapshot.getHardwareBuffer());
|
tx.setBuffer(mLeash, mSnapshot.getHardwareBuffer());
|
||||||
// Relocate the content to parentLeash's coordinates.
|
// Relocate the content to parentLeash's coordinates.
|
||||||
tx.setPosition(mLeash, -mSourceRectHint.left, -mSourceRectHint.top);
|
tx.setPosition(mLeash, -mSourceRectHint.left, -mSourceRectHint.top);
|
||||||
tx.setWindowCrop(mLeash,
|
|
||||||
(int) (mSourceRectHint.width() * mTaskSnapshotScaleX),
|
|
||||||
(int) (mSourceRectHint.height() * mTaskSnapshotScaleY));
|
|
||||||
tx.setScale(mLeash, mTaskSnapshotScaleX, mTaskSnapshotScaleY);
|
tx.setScale(mLeash, mTaskSnapshotScaleX, mTaskSnapshotScaleY);
|
||||||
tx.reparent(mLeash, parentLeash);
|
tx.reparent(mLeash, parentLeash);
|
||||||
tx.apply();
|
tx.apply();
|
||||||
|
|||||||
Reference in New Issue
Block a user