From e544ddd0e0599169ac2b7651f855bd4d764721a6 Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Fri, 24 Mar 2023 04:33:33 +0000 Subject: [PATCH] Include the end bounds in the whole screen bounds The end bounds was not included in the whole screen bounds in commit b4478c5. Restore the change. Bug: 267044260 Test: steps on the bug Change-Id: I40991cd4c64312f07676c86293f8fe0f41e9adb8 --- .../extensions/embedding/TaskFragmentAnimationRunner.java | 1 + .../activityembedding/ActivityEmbeddingAnimationRunner.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationRunner.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationRunner.java index 7fc8310ed303d..b917ac80256c5 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationRunner.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationRunner.java @@ -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); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java index 1e3d79567d1ef..1df6ecda78c3e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/activityembedding/ActivityEmbeddingAnimationRunner.java @@ -224,7 +224,7 @@ class ActivityEmbeddingAnimationRunner { openingWholeScreenBounds.union(change.getEndAbsBounds()); } else { closingChanges.add(change); - closingWholeScreenBounds.union(change.getStartAbsBounds()); + closingWholeScreenBounds.union(change.getEndAbsBounds()); } }