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

Merge "Fix black screen while animating a closing and changing TF" into tm-qpr-dev am: 8cc83cc48e

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

Change-Id: Ie420621d5e0dca553b04b13dc361ad9f0d43b4af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2023-03-24 08:23:38 +00:00
committed by Automerger Merge Worker
parent 9f23237175 8cc83cc48e
commit d12365c0ce
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,6 +215,8 @@ class TaskFragmentAnimationRunner extends IRemoteAnimationRunner.Stub {
} else { } else {
closingTargets.add(target); closingTargets.add(target);
closingWholeScreenBounds.union(target.screenSpaceBounds); closingWholeScreenBounds.union(target.screenSpaceBounds);
// Union the start bounds since this may be the ClosingChanging animation.
closingWholeScreenBounds.union(target.startBounds);
} }
} }

9
services/core/java/com/android/server/wm/TaskFragment.java
View File

@@ -2501,13 +2501,18 @@ class TaskFragment extends WindowContainer<WindowContainer> {
} }
} }
/** Records the starting bounds of the closing organized TaskFragment. */ /**
void setClosingChangingStartBoundsIfNeeded() { * Returns {@code true} if the starting bounds of the closing organized TaskFragment is
* recorded. Otherwise, return {@code false}.
*/
boolean setClosingChangingStartBoundsIfNeeded() {
if (isOrganizedTaskFragment() && mDisplayContent != null if (isOrganizedTaskFragment() && mDisplayContent != null
&& mDisplayContent.mChangingContainers.remove(this)) { && mDisplayContent.mChangingContainers.remove(this)) {
mDisplayContent.mClosingChangingContainers.put( mDisplayContent.mClosingChangingContainers.put(
this, new Rect(mSurfaceFreezer.mFreezeBounds)); this, new Rect(mSurfaceFreezer.mFreezeBounds));
return true;
} }
return false;
} }
@Override @Override

6
services/core/java/com/android/server/wm/WindowContainer.java
View File

@@ -1299,15 +1299,19 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
// If we are losing visibility, then a snapshot isn't necessary and we are no-longer // If we are losing visibility, then a snapshot isn't necessary and we are no-longer
// part of a change transition. // part of a change transition.
if (!visible) { if (!visible) {
boolean skipUnfreeze = false;
if (asTaskFragment() != null) { if (asTaskFragment() != null) {
// If the organized TaskFragment is closing while resizing, we want to keep track of // If the organized TaskFragment is closing while resizing, we want to keep track of
// its starting bounds to make sure the animation starts at the correct position. // its starting bounds to make sure the animation starts at the correct position.
// This should be called before unfreeze() because we record the starting bounds // This should be called before unfreeze() because we record the starting bounds
// in SurfaceFreezer. // in SurfaceFreezer.
asTaskFragment().setClosingChangingStartBoundsIfNeeded(); skipUnfreeze = asTaskFragment().setClosingChangingStartBoundsIfNeeded();
} }
if (!skipUnfreeze) {
mSurfaceFreezer.unfreeze(getSyncTransaction()); mSurfaceFreezer.unfreeze(getSyncTransaction());
} }
}
WindowContainer parent = getParent(); WindowContainer parent = getParent();
if (parent != null) { if (parent != null) {
parent.onChildVisibilityRequested(visible); parent.onChildVisibilityRequested(visible);