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

Commit 4e92bac8 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: I805e25ff708c0183f4774ae198553b7a5956bf36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56f14bf5 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());

            }

        }