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 udc-dev

Browse Source
This commit is contained in:
Louis Chang
2023-03-24 00:37:22 +00:00
committed by Android (Google) Code Review
parent 4088e9a74d b4478c5639
commit 3e12034586
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,7 +214,8 @@ class TaskFragmentAnimationRunner extends IRemoteAnimationRunner.Stub {
openingWholeScreenBounds.union(target.screenSpaceBounds); openingWholeScreenBounds.union(target.screenSpaceBounds);
} else { } else {
closingTargets.add(target); 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()); openingWholeScreenBounds.union(change.getEndAbsBounds());
} else { } else {
closingChanges.add(change); closingChanges.add(change);
closingWholeScreenBounds.union(change.getEndAbsBounds()); closingWholeScreenBounds.union(change.getStartAbsBounds());
} }
} }

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

@@ -2553,13 +2553,18 @@ class TaskFragment extends WindowContainer<WindowContainer> {
return task != null && !task.isDragResizing() && super.canStartChangeTransition(); return task != null && !task.isDragResizing() && super.canStartChangeTransition();
} }
/** 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

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

@@ -1336,14 +1336,18 @@ 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) {