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

Commit 1b6d46f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remving SurfaceControlCompat"

parents 29004de0 26a1a46b

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -1410,7 +1410,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                .setContext(mContext)

                .setTaskId(runningTaskTarget.taskId)

                .setComponentName(taskInfo.topActivity)

                .setLeash(runningTaskTarget.leash.getSurfaceControl())

                .setLeash(runningTaskTarget.leash)

                .setSourceRectHint(

                        runningTaskTarget.taskInfo.pictureInPictureParams.getSourceRectHint())

                .setAppBounds(taskInfo.configuration.windowConfiguration.getBounds())

quickstep/src/com/android/quickstep/RecentsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 
            RemoteAnimationTargets targets = new RemoteAnimationTargets(

                    appTargets, wallpaperTargets, nonAppTargets, MODE_OPENING);

            for (RemoteAnimationTargetCompat app : targets.apps) {

                new Transaction().setAlpha(app.leash.getSurfaceControl(), 1).apply();

                new Transaction().setAlpha(app.leash, 1).apply();

            }

            AnimatorSet anim = new AnimatorSet();

            anim.play(controller.getAnimationPlayer());

quickstep/src/com/android/quickstep/TaskViewUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ public final class TaskViewUtils { 
        for (RemoteAnimationTargetCompat appTarget : appTargets) {

            final int taskId = appTarget.taskInfo != null ? appTarget.taskInfo.taskId : -1;

            final int mode = appTarget.mode;

            final SurfaceControl leash = appTarget.leash.getSurfaceControl();

            final SurfaceControl leash = appTarget.leash;

            if (leash == null) {

                continue;

            }
@@ -484,7 +484,7 @@ public final class TaskViewUtils { 
        }



        for (int i = 0; i < nonAppTargets.length; ++i) {

            final SurfaceControl leash = appTargets[i].leash.getSurfaceControl();

            final SurfaceControl leash = appTargets[i].leash;

            if (nonAppTargets[i].windowType == TYPE_DOCK_DIVIDER && leash != null) {

                openingTargets.add(leash);

            }
@@ -611,7 +611,7 @@ public final class TaskViewUtils { 
        boolean hasSurfaceToAnimate = false;

        for (int i = 0; i < nonApps.length; ++i) {

            final RemoteAnimationTargetCompat targ = nonApps[i];

            final SurfaceControl leash = targ.leash.getSurfaceControl();

            final SurfaceControl leash = targ.leash;

            if (targ.windowType == TYPE_DOCK_DIVIDER && leash != null) {

                auxiliarySurfaces.add(leash);

                hasSurfaceToAnimate = true;

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

+2 −2
Original line number Diff line number Diff line
@@ -174,10 +174,10 @@ public class TransformParams { 
            RemoteAnimationTargetCompat app = targets.unfilteredApps[i];

            if (app.mode == targets.targetMode) {

                if (app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_RECENTS) {

                    return app.leash.getSurfaceControl();

                    return app.leash;

                }

            } else {

                return app.leash.getSurfaceControl();

                return app.leash;

            }

        }

        return null;