Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c00a542 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

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

parents 8a401e88 1e60b1a4

quickstep/src/com/android/quickstep/util/TaskViewSimulator.java

+10 −3
Original line number Diff line number Diff line
@@ -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.

            if (ENABLE_SHELL_TRANSITIONS) {

                builder.setLayer(mDrawsBelowRecents

                        ? Integer.MIN_VALUE + app.prefixOrderIndex

                    : ENABLE_SHELL_TRANSITIONS ? Integer.MAX_VALUE : 0);

                        // 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);

            }

        }

    }

quickstep/src/com/android/quickstep/views/TaskView.java

+0 −3
Original line number Diff line number Diff line
@@ -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