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

Commit 8dcb40b4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Offset task coordinates from activity layer crops" into tm-qpr-dev am:... 

Merge "Offset task coordinates from activity layer crops" into tm-qpr-dev am: bf8ac793 am: 541cb284

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



Change-Id: Ic236a47c40734370b66e9abd9fdfe41289bc6c49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a563b989 541cb284

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

+3 −7
Original line number Diff line number Diff line
@@ -437,14 +437,10 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
                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) {

                // display rotation. No need to clip activities because they rely on clipping on

                // task layers.

                if (target.asDisplayContent() != null || target.asActivityRecord() != 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);