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

Commit 02e2865a authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge changes from topics "am-d455296f-ca9f-4a88-999f-65e8ba3f6b8a",... 

Merge changes from topics "am-d455296f-ca9f-4a88-999f-65e8ba3f6b8a", "am-6ed11203-0b52-4aea-b304-3f471c0aa3bf" into ub-launcher3-edmonton-polish

* changes:
  [automerger] Use SyncRtSurfaceTransactionApplier for recents enter/exit am: 80b93147
  Use SyncRtSurfaceTransactionApplier for recents enter/exit
  [automerger] Use SyncRtSurfaceTransactionApplier for app opening am: 1008f6d7
  Use SyncRtSurfaceTransactionApplier for app opening
parents e185ee54 a7fdc397

quickstep/libs/sysui_shared.jar

+2.99 KiB (129 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

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

+46 −43
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.launcher3.util.MultiValueAlpha.AlphaProperty; 
import com.android.quickstep.util.ClipAnimationHelper;

import com.android.quickstep.util.MultiValueUpdateListener;

import com.android.quickstep.util.RemoteAnimationProvider;

import com.android.quickstep.util.RemoteAnimationTargetSet;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.system.ActivityCompat;
@@ -80,7 +81,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.TransactionCompat;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier;

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplier.SurfaceParams;

import com.android.systemui.shared.system.WindowManagerWrapper;



/**
@@ -558,22 +560,21 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 
        Rect crop = new Rect();

        Matrix matrix = new Matrix();



        RemoteAnimationTargetSet openingTargets = new RemoteAnimationTargetSet(targets,

                MODE_OPENING);

        RemoteAnimationTargetSet closingTargets = new RemoteAnimationTargetSet(targets,

                MODE_CLOSING);

        SyncRtSurfaceTransactionApplier surfaceApplier = new SyncRtSurfaceTransactionApplier(

                mFloatingView);



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

        appAnimator.setDuration(APP_LAUNCH_DURATION);

        appAnimator.addUpdateListener(new MultiValueUpdateListener() {

            // Fade alpha for the app window.

            FloatProp mAlpha = new FloatProp(0f, 1f, 0, 60, LINEAR);

            boolean isFirstFrame = true;



            @Override

            public void onUpdate(float percent) {

                final Surface surface = getSurface(mFloatingView);

                final long frameNumber = surface != null ? getNextFrameNumber(surface) : -1;

                if (frameNumber == -1) {

                    // Booo, not cool! Our surface got destroyed, so no reason to animate anything.

                    Log.w(TAG, "Failed to animate, surface got destroyed.");

                    return;

                }

                final float easePercent = AGGRESSIVE_EASE.getInterpolation(percent);



                // Calculate app icon size.
@@ -584,7 +585,6 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 
                float scaleX = iconWidth / windowTargetBounds.width();

                float scaleY = iconHeight / windowTargetBounds.height();

                float scale = Math.min(1f, Math.min(scaleX, scaleY));

                matrix.setScale(scale, scale);



                // Position the scaled window on top of the icon

                int windowWidth = windowTargetBounds.width();
@@ -598,7 +598,6 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 


                float transX0 = floatingViewBounds[0] - offsetX;

                float transY0 = floatingViewBounds[1] - offsetY;

                matrix.postTranslate(transX0, transY0);



                // Animate the window crop so that it starts off as a square, and then reveals

                // horizontally.
@@ -609,23 +608,27 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 
                crop.right = windowWidth;

                crop.bottom = (int) (crop.top + cropHeight);



                TransactionCompat t = new TransactionCompat();

                if (isFirstFrame) {

                    RemoteAnimationProvider.prepareTargetsForFirstFrame(targets, t, MODE_OPENING);

                    isFirstFrame = false;

                }

                for (RemoteAnimationTargetCompat target : targets) {

                SurfaceParams[] params = new SurfaceParams[targets.length];

                for (int i = targets.length - 1; i >= 0; i--) {

                    RemoteAnimationTargetCompat target = targets[i];



                    Rect targetCrop;

                    float alpha;

                    if (target.mode == MODE_OPENING) {

                        t.setAlpha(target.leash, mAlpha.value);

                        t.setMatrix(target.leash, matrix);

                        t.setWindowCrop(target.leash, crop);

                        t.deferTransactionUntil(target.leash, surface, getNextFrameNumber(surface));

                    }

                        matrix.setScale(scale, scale);

                        matrix.postTranslate(transX0, transY0);

                        targetCrop = crop;

                        alpha = mAlpha.value;

                    } else {

                        matrix.reset();

                        alpha = 1f;

                        targetCrop = target.sourceContainerBounds;

                    }

                t.setEarlyWakeup();

                t.apply();



                matrix.reset();

                    params[i] = new SurfaceParams(target.leash, alpha, matrix, targetCrop,

                            RemoteAnimationProvider.getLayer(target, MODE_OPENING));

                }

                surfaceApplier.scheduleApply(params);

            }

        });

        return appAnimator;
@@ -705,6 +708,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);

        Matrix matrix = new Matrix();

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

        int duration = CLOSING_TRANSITION_DURATION_MS;
@@ -714,30 +719,28 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag 
            FloatProp mScale = new FloatProp(1f, 1f, 0, duration, DEACCEL_1_7);

            FloatProp mAlpha = new FloatProp(1f, 0f, 25, 125, LINEAR);



            boolean isFirstFrame = true;



            @Override

            public void onUpdate(float percent) {

                TransactionCompat t = new TransactionCompat();

                if (isFirstFrame) {

                    RemoteAnimationProvider.prepareTargetsForFirstFrame(targets, t, MODE_CLOSING);

                    isFirstFrame = false;

                }

                for (RemoteAnimationTargetCompat app : targets) {

                    if (app.mode == RemoteAnimationTargetCompat.MODE_CLOSING) {

                        t.setAlpha(app.leash, mAlpha.value);

                SurfaceParams[] params = new SurfaceParams[targets.length];

                for (int i = targets.length - 1; i >= 0; i--) {

                    RemoteAnimationTargetCompat target = targets[i];

                    float alpha;

                    if (target.mode == MODE_CLOSING) {

                        matrix.setScale(mScale.value, mScale.value,

                                app.sourceContainerBounds.centerX(),

                                app.sourceContainerBounds.centerY());

                                target.sourceContainerBounds.centerX(),

                                target.sourceContainerBounds.centerY());

                        matrix.postTranslate(0, mDy.value);

                        matrix.postTranslate(app.position.x, app.position.y);

                        t.setMatrix(app.leash, matrix);

                        matrix.postTranslate(target.position.x, target.position.y);

                        alpha = mAlpha.value;

                    } else {

                        matrix.reset();

                        alpha = 1f;

                    }

                    params[i] = new SurfaceParams(target.leash, alpha, matrix,

                            target.sourceContainerBounds,

                            RemoteAnimationProvider.getLayer(target, MODE_CLOSING));

                }

                t.setEarlyWakeup();

                t.apply();



                matrix.reset();

                surfaceApplier.scheduleApply(params);

            }

        });

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

+5 −1
Original line number Diff line number Diff line
@@ -67,6 +67,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.TransactionCompat;



import java.util.ArrayList;
@@ -350,11 +351,14 @@ public class OverviewCommandHelper { 
            clipHelper.updateTargetRect(targetRect);

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



            SyncRtSurfaceTransactionApplier syncTransactionApplier =

                    new SyncRtSurfaceTransactionApplier(rootView);

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

            valueAnimator.setDuration(RECENTS_LAUNCH_DURATION);

            valueAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

            valueAnimator.addUpdateListener((v) ->

                    clipHelper.applyTransform(targetSet, (float) v.getAnimatedValue()));

                    clipHelper.applyTransform(targetSet, (float) v.getAnimatedValue(),

                            syncTransactionApplier));



            if (targetSet.isAnimatingHome()) {

                // If we are animating home, fade in the opening targets

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

+6 −18
Original line number Diff line number Diff line
@@ -46,6 +46,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 java.util.List;
@@ -144,6 +145,8 @@ public class TaskUtils { 
     */

    public static ValueAnimator getRecentsWindowAnimator(TaskView v, boolean skipViewChanges,

            RemoteAnimationTargetCompat[] targets, final ClipAnimationHelper inOutHelper) {

        SyncRtSurfaceTransactionApplier syncTransactionApplier =

                new SyncRtSurfaceTransactionApplier(v);

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

        appAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);

        appAnimator.addUpdateListener(new MultiValueUpdateListener() {
@@ -155,18 +158,10 @@ public class TaskUtils { 
            final RemoteAnimationTargetSet mTargetSet;



            final RectF mThumbnailRect;

            private Surface mSurface;

            private long mFrameNumber;



            {

                mTargetSet = new RemoteAnimationTargetSet(targets, MODE_OPENING);

                inOutHelper.setTaskTransformCallback((t, app) -> {

                    t.setAlpha(app.leash, mTaskAlpha.value);



                    if (!skipViewChanges) {

                        t.deferTransactionUntil(app.leash, mSurface, mFrameNumber);

                    }

                });

                inOutHelper.setTaskAlphaCallback((t, alpha) -> mTaskAlpha.value);



                inOutHelper.prepareAnimation(true /* isOpening */);

                inOutHelper.fromTaskThumbnailView(v.getThumbnail(), (RecentsView) v.getParent(),
@@ -179,15 +174,8 @@ public class TaskUtils { 


            @Override

            public void onUpdate(float percent) {

                mSurface = getSurface(v);

                mFrameNumber = mSurface != null ? getNextFrameNumber(mSurface) : -1;

                if (mFrameNumber == -1) {

                    // Booo, not cool! Our surface got destroyed, so no reason to animate anything.

                    Log.w(TAG, "Failed to animate, surface got destroyed.");

                    return;

                }



                RectF taskBounds = inOutHelper.applyTransform(mTargetSet, 1 - percent);

                RectF taskBounds = inOutHelper.applyTransform(mTargetSet, 1 - percent,

                        syncTransactionApplier);

                if (!skipViewChanges) {

                    float scale = taskBounds.width() / mThumbnailRect.width();

                    v.setScaleX(scale);

quickstep/src/com/android/quickstep/TouchInteractionService.java

+2 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.quickstep.views.RecentsView; 
import com.android.systemui.shared.recents.IOverviewProxy;

import com.android.systemui.shared.recents.ISystemUiProxy;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.ChoreographerCompat;

import com.android.systemui.shared.system.NavigationBarCompat.HitTarget;



/**
@@ -406,6 +407,6 @@ public class TouchInteractionService extends Service { 
            sRemoteUiThread.start();

        }

        new Handler(sRemoteUiThread.getLooper()).post(() ->

                mBackgroundThreadChoreographer = Choreographer.getInstance());

                mBackgroundThreadChoreographer = ChoreographerCompat.getSfInstance());

    }

}