Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove conflict window crop" into tm-dev am: 3fa5b5332b am: 6d85f2080b

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

Change-Id: I54a5b2e273514c8cf7636f3d229de3ad55896b9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2022-06-03 03:40:11 +00:00
committed by Automerger Merge Worker
parent e432522c8d 6d85f2080b
commit 393d838d44
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();