Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Louis Chang
2023-03-27 01:27:45 +00:00
committed by Android (Google) Code Review
parent 290172443a e544ddd0e0
commit dc317dcc42
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}

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

@@ -224,7 +224,7 @@ class ActivityEmbeddingAnimationRunner {
openingWholeScreenBounds.union(change.getEndAbsBounds());
} else {
closingChanges.add(change);
closingWholeScreenBounds.union(change.getStartAbsBounds());
closingWholeScreenBounds.union(change.getEndAbsBounds());
}
}