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

Commit 457c20eb authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

SyncRtTransactionApplier -> SyncRtTransactionApplierCompat 

Bug: 118118435
Change-Id: I37bba45db79890f5d7ae6c1d1d63422a89230b35
parent 09b404cc

quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+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;



/**
@@ -580,8 +580,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);
@@ -740,8 +740,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;

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

+3 −3
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;
@@ -343,8 +343,8 @@ public class OverviewCommandHelper { 
            clipHelper.updateTargetRect(targetRect);

            clipHelper.prepareAnimation(false /* isOpening */);



            SyncRtSurfaceTransactionApplier syncTransactionApplier =

                    new SyncRtSurfaceTransactionApplier(rootView);

            SyncRtSurfaceTransactionApplierCompat syncTransactionApplier =

                    new SyncRtSurfaceTransactionApplierCompat(rootView);

            ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1);

            valueAnimator.setDuration(RECENTS_LAUNCH_DURATION);

            valueAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

quickstep/src/com/android/quickstep/TaskUtils.java

+3 −3
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;
@@ -145,8 +145,8 @@ public class TaskUtils { 
     */

    public static ValueAnimator getRecentsWindowAnimator(TaskView v, boolean skipViewChanges,

            RemoteAnimationTargetCompat[] targets, final ClipAnimationHelper inOutHelper) {

        SyncRtSurfaceTransactionApplier syncTransactionApplier =

                new SyncRtSurfaceTransactionApplier(v);

        SyncRtSurfaceTransactionApplierCompat syncTransactionApplier =

                new SyncRtSurfaceTransactionApplierCompat(v);

        final ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1);

        appAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

        appAnimator.addUpdateListener(new MultiValueUpdateListener() {

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,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;
@@ -213,7 +213,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) -> { };
@@ -403,7 +403,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> { 
        }



        mRecentsView = activity.getOverviewPanel();

        SyncRtSurfaceTransactionApplier.create(mRecentsView, (applier) -> {

        SyncRtSurfaceTransactionApplierCompat.create(mRecentsView, (applier) -> {

            mSyncTransactionApplier = applier;

        });

        mQuickScrubController = mRecentsView.getQuickScrubController();

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

+5 −5
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;
@@ -152,7 +152,7 @@ public class ClipAnimationHelper { 
    }



    public RectF applyTransform(RemoteAnimationTargetSet targetSet, float progress,

            @Nullable SyncRtSurfaceTransactionApplier syncTransactionApplier) {

            @Nullable SyncRtSurfaceTransactionApplierCompat syncTransactionApplier) {

        RectF currentRect;

        mTmpRectF.set(mTargetRect);

        Utilities.scaleRectFAboutCenter(mTmpRectF, mTargetScale);
@@ -218,14 +218,14 @@ public class ClipAnimationHelper { 
        return mCurrentRectWithInsets;

    }



    private void applyParams(@Nullable SyncRtSurfaceTransactionApplier syncTransactionApplier,

    private void applyParams(@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();