Merge "Fix layering issue when launching from side TaskView" into main

This commit is contained in:
Tony Wickham
2023-12-14 01:05:01 +00:00
committed by Android (Google) Code Review
2 changed files with 10 additions and 6 deletions

View File

@@ -427,9 +427,16 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
// conflict with layers that WM core positions (ie. the input consumers). For shell
// transitions, the animation leashes are reparented to an animation container so we
// can bump layers as needed.
builder.setLayer(mDrawsBelowRecents
? Integer.MIN_VALUE + app.prefixOrderIndex
: ENABLE_SHELL_TRANSITIONS ? Integer.MAX_VALUE : 0);
if (ENABLE_SHELL_TRANSITIONS) {
builder.setLayer(mDrawsBelowRecents
? Integer.MIN_VALUE + app.prefixOrderIndex
// 1000 is an arbitrary number to give room for multiple layers.
: Integer.MAX_VALUE - 1000 + app.prefixOrderIndex);
} else {
builder.setLayer(mDrawsBelowRecents
? Integer.MIN_VALUE + app.prefixOrderIndex
: 0);
}
}
}

View File

@@ -1035,9 +1035,6 @@ public class TaskView extends FrameLayout implements Reusable {
anim.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationStart(Animator animation) {
if (!recentsView.showAsGrid()) {
return;
}
recentsView.runActionOnRemoteHandles(
(Consumer<RemoteTargetHandle>) remoteTargetHandle ->
remoteTargetHandle