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

Commit 60b738b4 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix finishTransaction window crop with requestedOverrideBounds" into... 

Merge "Fix finishTransaction window crop with requestedOverrideBounds" into tm-qpr-dev am: 085442bc

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



Change-Id: I718978f4de73c6f7689d87bdd5d3f7aa651878fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9dd5ccbc 085442bc

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

+4 −5
Original line number Original line Diff line number Diff line
@@ -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);