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

Commit 15f733ab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reset crop after finished transition" into tm-dev am: 02853a7a 

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



Change-Id: I00d58372a5d82aef1272646cf1ba54cb17fa526d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebc7a8ac 02853a7a

services/core/java/com/android/server/wm/Transition.java

+15 −0
Original line number Diff line number Diff line
@@ -426,6 +426,21 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
                t.setLayer(targetLeash, target.getLastLayer());

                target.getRelativePosition(tmpPos);

                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

                // display rotation.

                if (target.asDisplayContent() != null) {

                    clipRect = null;

                } else if (target.asActivityRecord() != null) {

                    // Always use parent bounds of activity because letterbox area (e.g. fixed

                    // aspect ratio or size compat mode) should be included.

                    clipRect = target.getParent().getRequestedOverrideBounds();

                    clipRect.offset(-tmpPos.x, -tmpPos.y);

                } else {

                    clipRect = target.getRequestedOverrideBounds();

                    clipRect.offset(-tmpPos.x, -tmpPos.y);

                }

                t.setCrop(targetLeash, clipRect);

                t.setCornerRadius(targetLeash, 0);

                t.setShadowRadius(targetLeash, 0);

                t.setMatrix(targetLeash, 1, 0, 0, 1);