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

Commit 200bfb4b authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Include the end bounds in the whole screen bounds" into udc-dev am: dc317dcc 

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



Change-Id: Ie44a8b33680fc026fa87fbff874b97b2d0087d30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac73e451 dc317dcc

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationRunner.java

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ class TaskFragmentAnimationRunner extends IRemoteAnimationRunner.Stub { 
                openingWholeScreenBounds.union(target.screenSpaceBounds);

            } else {

                closingTargets.add(target);

                closingWholeScreenBounds.union(target.screenSpaceBounds);

                // Union the start bounds since this may be the ClosingChanging animation.

                closingWholeScreenBounds.union(target.startBounds);

            }

libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ class ActivityEmbeddingAnimationRunner { 
                openingWholeScreenBounds.union(change.getEndAbsBounds());

            } else {

                closingChanges.add(change);

                closingWholeScreenBounds.union(change.getStartAbsBounds());

                closingWholeScreenBounds.union(change.getEndAbsBounds());

            }

        }