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

Merge "Fix finishTransaction window crop with requestedOverrideBounds" into tm-qpr-dev

Browse Source
This commit is contained in:
Chris Li
2022-09-09 12:32:03 +00:00
committed by Android (Google) Code Review
parent bd8d6fc437 663b4062a5
commit 085442bcb9
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/Transition.java
View File

@@ -577,17 +577,16 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
t.setLayer(targetLeash, target.getLastLayer()); t.setLayer(targetLeash, target.getLastLayer());
target.getRelativePosition(tmpPos); target.getRelativePosition(tmpPos);
t.setPosition(targetLeash, tmpPos.x, tmpPos.y); t.setPosition(targetLeash, tmpPos.x, tmpPos.y);
final Rect clipRect;
// No need to clip the display in case seeing the clipped content when during the // No need to clip the display in case seeing the clipped content when during the
// display rotation. No need to clip activities because they rely on clipping on // display rotation. No need to clip activities because they rely on clipping on
// task layers. // task layers.
if (target.asDisplayContent() != null || target.asActivityRecord() != null) { if (target.asDisplayContent() != null || target.asActivityRecord() != null) {
clipRect = null; t.setCrop(targetLeash, null /* crop */);
} else { } else {
clipRect = target.getRequestedOverrideBounds(); // Crop to the requested bounds.
clipRect.offset(-tmpPos.x, -tmpPos.y); final Rect clipRect = target.getRequestedOverrideBounds();
t.setWindowCrop(targetLeash, clipRect.width(), clipRect.height());
} }
t.setCrop(targetLeash, clipRect);
t.setCornerRadius(targetLeash, 0); t.setCornerRadius(targetLeash, 0);
t.setShadowRadius(targetLeash, 0); t.setShadowRadius(targetLeash, 0);
t.setMatrix(targetLeash, 1, 0, 0, 1); t.setMatrix(targetLeash, 1, 0, 0, 1);