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

Commit 37a089d7 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Winson Chung
Browse files

SyncRtTransactionApplier -> SyncRtTransactionApplierCompat

Bug: 118118435
Change-Id: I37bba45db79890f5d7ae6c1d1d63422a89230b35
parent 5b3bf3b8
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ import com.android.systemui.shared.system.RemoteAnimationAdapterCompat;
import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;
import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier.SurfaceParams;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
import com.android.systemui.shared.system.WindowManagerWrapper;

/**
@@ -591,8 +591,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
                MODE_OPENING);
        RemoteAnimationTargetSet closingTargets = new RemoteAnimationTargetSet(targets,
                MODE_CLOSING);
        SyncRtSurfaceTransactionApplier surfaceApplier = new SyncRtSurfaceTransactionApplier(
                mFloatingView);
        SyncRtSurfaceTransactionApplierCompat surfaceApplier =
                new SyncRtSurfaceTransactionApplierCompat(mFloatingView);

        ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);
        appAnimator.setDuration(APP_LAUNCH_DURATION);
@@ -751,8 +751,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
     * Animator that controls the transformations of the windows the targets that are closing.
     */
    private Animator getClosingWindowAnimators(RemoteAnimationTargetCompat[] targets) {
        SyncRtSurfaceTransactionApplier surfaceApplier =
                new SyncRtSurfaceTransactionApplier(mDragLayer);
        SyncRtSurfaceTransactionApplierCompat surfaceApplier =
                new SyncRtSurfaceTransactionApplierCompat(mDragLayer);
        Matrix matrix = new Matrix();
        ValueAnimator closingAnimator = ValueAnimator.ofFloat(0, 1);
        int duration = CLOSING_TRANSITION_DURATION_MS;
+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
import com.android.systemui.shared.system.LatencyTrackerCompat;
import com.android.systemui.shared.system.PackageManagerWrapper;
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
import com.android.systemui.shared.system.TransactionCompat;

import java.util.ArrayList;
@@ -344,7 +344,7 @@ public class OverviewCommandHelper {
            clipHelper.prepareAnimation(false /* isOpening */);

            ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()
                    .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplier(rootView));
                    .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplierCompat(rootView));
            ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1);
            valueAnimator.setDuration(RECENTS_LAUNCH_DURATION);
            valueAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);
+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.quickstep.views.RecentsView;
import com.android.quickstep.views.TaskView;
import com.android.systemui.shared.recents.model.Task;
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;

import java.util.List;

@@ -146,7 +146,8 @@ public class TaskUtils {
    public static ValueAnimator getRecentsWindowAnimator(TaskView v, boolean skipViewChanges,
            RemoteAnimationTargetCompat[] targets, final ClipAnimationHelper inOutHelper) {
        ClipAnimationHelper.TransformParams params = new ClipAnimationHelper.TransformParams()
                .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplier(v));
                .setSyncTransactionApplier(new SyncRtSurfaceTransactionApplierCompat(v));
        
        final ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);
        appAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);
        appAnimator.addUpdateListener(new MultiValueUpdateListener() {
+4 −4
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ import com.android.systemui.shared.system.InputConsumerController;
import com.android.systemui.shared.system.LatencyTrackerCompat;
import com.android.systemui.shared.system.RecentsAnimationControllerCompat;
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
import com.android.systemui.shared.system.WindowCallbacksCompat;

import java.util.StringJoiner;
@@ -217,7 +217,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
    private T mActivity;
    private LayoutListener mLayoutListener;
    private RecentsView mRecentsView;
    private SyncRtSurfaceTransactionApplier mSyncTransactionApplier;
    private SyncRtSurfaceTransactionApplierCompat mSyncTransactionApplier;
    private QuickScrubController mQuickScrubController;
    private AnimationFactory mAnimationFactory = (t, i) -> { };

@@ -408,7 +408,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
        }

        mRecentsView = activity.getOverviewPanel();
        SyncRtSurfaceTransactionApplier.create(mRecentsView, (applier) -> {
        SyncRtSurfaceTransactionApplierCompat.create(mRecentsView, (applier) -> {
            mSyncTransactionApplier = applier;
        });
        mQuickScrubController = mRecentsView.getQuickScrubController();
@@ -589,7 +589,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {

        RecentsAnimationControllerCompat controller = mRecentsAnimationWrapper.getController();
        if (controller != null) {
            SyncRtSurfaceTransactionApplier syncTransactionApplier
            SyncRtSurfaceTransactionApplierCompat syncTransactionApplier
                    = Looper.myLooper() == mMainThreadHandler.getLooper()
                            ? mSyncTransactionApplier
                            : null;
+7 −6
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ import com.android.quickstep.views.TaskThumbnailView;
import com.android.systemui.shared.recents.ISystemUiProxy;
import com.android.systemui.shared.recents.utilities.RectFEvaluator;
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier.SurfaceParams;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
import com.android.systemui.shared.system.TransactionCompat;
import com.android.systemui.shared.system.WindowManagerWrapper;

@@ -217,14 +217,14 @@ public class ClipAnimationHelper {
        return mCurrentRectWithInsets;
    }

    private void applySurfaceParams(@Nullable SyncRtSurfaceTransactionApplier
    private void applySurfaceParams(@Nullable SyncRtSurfaceTransactionApplierCompat
            syncTransactionApplier, SurfaceParams[] params) {
        if (syncTransactionApplier != null) {
            syncTransactionApplier.scheduleApply(params);
        } else {
            TransactionCompat t = new TransactionCompat();
            for (SurfaceParams param : params) {
                SyncRtSurfaceTransactionApplier.applyParams(t, param);
                SyncRtSurfaceTransactionApplierCompat.applyParams(t, param);
            }
            t.setEarlyWakeup();
            t.apply();
@@ -353,7 +353,7 @@ public class ClipAnimationHelper {

    public static class TransformParams {
        float progress;
        SyncRtSurfaceTransactionApplier syncTransactionApplier;
        SyncRtSurfaceTransactionApplierCompat syncTransactionApplier;

        public TransformParams() {
            progress = 0;
@@ -364,7 +364,8 @@ public class ClipAnimationHelper {
            return this;
        }

        public TransformParams setSyncTransactionApplier(SyncRtSurfaceTransactionApplier applier) {
        public TransformParams setSyncTransactionApplier(
                SyncRtSurfaceTransactionApplierCompat applier) {
            this.syncTransactionApplier = applier;
            return this;
        }