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

Commit 7c089816 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Only apply crop to task and task fragment in end transition" into... 

Merge "Only apply crop to task and task fragment in end transition" into tm-qpr-dev am: 0e8f4211 am: 04e8b101

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



Change-Id: I33078d5279addc4f7a098fdc967aa772685ff268
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32765d94 04e8b101

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

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
                // 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

                // task layers.

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

                if (target.asTaskFragment() == null) {

                    t.setCrop(targetLeash, null /* crop */);

                } else {

                    // Crop to the resolved override bounds.