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

Commit 6d4fe47e authored by Uwais Ashraf's avatar Uwais Ashraf Committed by Android (Google) Code Review
Browse files

Merge "Set draw below recents to true when opening an app" into main

parents d9026196 c69e52f7
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -196,12 +196,13 @@ public final class TaskViewUtils {
                remoteTargetHandles = gluer.assignTargets(targets);
            }
        }

        final int recentsActivityRotation =
                recentsView.getPagedViewOrientedState().getRecentsActivityRotation();
        for (RemoteTargetHandle remoteTargetGluer : remoteTargetHandles) {
            remoteTargetGluer.getTaskViewSimulator().getOrientationState().setRecentsRotation(
                    recentsActivityRotation);
            remoteTargetGluer.getTransformParams().setSyncTransactionApplier(applier);
        for (RemoteTargetHandle remoteTargetHandle : remoteTargetHandles) {
            remoteTargetHandle.getTaskViewSimulator().getOrientationState()
                    .setRecentsRotation(recentsActivityRotation);
            remoteTargetHandle.getTransformParams().setSyncTransactionApplier(applier);
        }

        int taskIndex = recentsView.indexOfChild(v);
@@ -393,6 +394,13 @@ public final class TaskViewUtils {
        }

        out.addListener(new AnimationSuccessListener() {
            @Override
            public void onAnimationStart(Animator animation) {
                for (RemoteTargetHandle remoteTargetHandle : remoteTargetHandles) {
                    remoteTargetHandle.getTaskViewSimulator().setDrawsBelowRecents(false);
                }
            }

            @Override
            public void onAnimationSuccess(Animator animator) {
                if (isQuickSwitch) {
+0 −9
Original line number Diff line number Diff line
@@ -1033,15 +1033,6 @@ public class TaskView extends FrameLayout implements Reusable {
                    mActivity.getStateManager(), recentsView,
                    recentsView.getDepthController());
            anim.addListener(new AnimatorListenerAdapter() {
                @Override
                public void onAnimationStart(Animator animation) {
                    recentsView.runActionOnRemoteHandles(
                            (Consumer<RemoteTargetHandle>) remoteTargetHandle ->
                                    remoteTargetHandle
                                            .getTaskViewSimulator()
                                            .setDrawsBelowRecents(false));
                }

                @Override
                public void onAnimationEnd(Animator animator) {
                    if (mTask != null && mTask.key.displayId != getRootViewDisplayId()) {