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

Commit a314d5ad authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Updating swipe up on home animations 

> Scaling down home activity on swipe-up from home and spring back to place on cancel
> Fading out recents on swipe-up to home, so ensure that adjecent tiles also dissapear
> Instead of controlling alpha, controlling full transform for base and home task. This allows adding custom animation for home task on swipe up.
> Removing alpha hanging for fallback activity in baseSwipeHandler. Instead controlling full transform for home activity
> Adding feature flag to use QuickstepLauncher as 3P Launcher to make development easier.

Bug: 156398988
Change-Id: I69cc59f2c9c95d15df6926ba635e7d6c251dceb6
parent 32f6cd11

quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java

+4 −1
Original line number Diff line number Diff line
@@ -136,10 +136,13 @@ final class AppToOverviewAnimationProvider<T extends StatefulActivity<?>> extend 
                        new SyncRtSurfaceTransactionApplierCompat(mActivity.getRootView()));



        AnimatedFloat recentsAlpha = new AnimatedFloat(() -> { });

        params.setBaseAlphaCallback((t, a) -> recentsAlpha.value);

        params.setBaseBuilderProxy((builder, app, p)

                -> builder.withAlpha(recentsAlpha.value));



        Interpolator taskInterpolator;

        if (targets.isAnimatingHome()) {

            params.setHomeBuilderProxy((builder, app, p) -> builder.withAlpha(1 - p.getProgress()));



            taskInterpolator = TOUCH_RESPONSE_INTERPOLATOR;

            pa.addFloat(recentsAlpha, AnimatedFloat.VALUE, 0, 1, TOUCH_RESPONSE_INTERPOLATOR);

        } else {

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java

+0 −17
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ import com.android.quickstep.util.ActiveGestureLog; 
import com.android.quickstep.util.RectFSpringAnim;

import com.android.quickstep.util.ShelfPeekAnim;

import com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState;

import com.android.quickstep.util.TransformParams.TargetAlphaProvider;

import com.android.quickstep.views.LiveTileOverlay;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;
@@ -671,10 +670,6 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte 
    protected InputConsumer createNewInputProxyHandler() {

        endRunningWindowAnim(mGestureState.getEndTarget() == HOME /* cancel */);

        endLauncherTransitionController();

        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            // Hide the task view, if not already hidden

            setTargetAlphaProvider(BaseSwipeUpHandlerV2::getHiddenTargetAlpha);

        }



        StatefulActivity activity = mActivityInterface.getCreatedActivity();

        return activity == null ? InputConsumer.NO_OP
@@ -1257,11 +1252,6 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte 
        reset();

    }



    private void setTargetAlphaProvider(TargetAlphaProvider provider) {

        mTransformParams.setTaskAlphaCallback(provider);

        updateFinalShift();

    }



    private void addLiveTileOverlay() {

        if (LiveTileOverlay.INSTANCE.attach(mActivity.getRootView().getOverlay())) {

            mRecentsView.setLiveTileOverlayAttached(true);
@@ -1273,13 +1263,6 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte 
        mRecentsView.setLiveTileOverlayAttached(false);

    }



    public static float getHiddenTargetAlpha(RemoteAnimationTargetCompat app, float expectedAlpha) {

        if (!isNotInRecents(app)) {

            return 0;

        }

        return expectedAlpha;

    }



    private static boolean isNotInRecents(RemoteAnimationTargetCompat app) {

        return app.isNotInRecents

                || app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java

+91 −10
Original line number Diff line number Diff line
@@ -15,23 +15,29 @@ 
 */

package com.android.quickstep;



import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.launcher3.anim.Interpolators.ACCEL;

import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;



import android.animation.ObjectAnimator;

import android.app.ActivityOptions;

import android.content.Context;

import android.content.Intent;

import android.graphics.Matrix;



import androidx.annotation.NonNull;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.anim.SpringAnimationBuilder;

import com.android.quickstep.fallback.FallbackRecentsView;

import com.android.quickstep.util.TransformParams;

import com.android.quickstep.util.TransformParams.BuilderProxy;

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

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

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

import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder;

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



/**

 * Handles the navigation gestures when a 3rd party launcher is the default home activity.
@@ -42,6 +48,9 @@ public class FallbackSwipeHandler extends 
    private FallbackHomeAnimationFactory mActiveAnimationFactory;

    private final boolean mRunningOverHome;



    private final Matrix mTmpMatrix = new Matrix();

    private float mMaxLauncherScale = 1;



    public FallbackSwipeHandler(Context context, RecentsAnimationDeviceState deviceState,

            TaskAnimationManager taskAnimationManager, GestureState gestureState, long touchTimeMs,

            boolean continuingLastGesture, InputConsumerController inputConsumer) {
@@ -49,6 +58,31 @@ public class FallbackSwipeHandler extends 
                continuingLastGesture, inputConsumer);



        mRunningOverHome = ActivityManagerWrapper.isHomeTask(mGestureState.getRunningTask());

        if (mRunningOverHome) {

            mTransformParams.setHomeBuilderProxy(this::updateHomeActivityTransformDuringSwipeUp);

        }

    }



    @Override

    protected void initTransitionEndpoints(DeviceProfile dp) {

        super.initTransitionEndpoints(dp);

        if (mRunningOverHome) {

            mMaxLauncherScale = 1 / mTaskViewSimulator.getFullScreenScale();

        }

    }



    private void updateHomeActivityTransformDuringSwipeUp(SurfaceParams.Builder builder,

            RemoteAnimationTargetCompat app, TransformParams params) {

        setHomeScaleAndAlpha(builder, app, mCurrentShift.value,

                Utilities.boundToRange(1 - mCurrentShift.value, 0, 1));

    }



    private void setHomeScaleAndAlpha(SurfaceParams.Builder builder,

            RemoteAnimationTargetCompat app, float verticalShift, float alpha) {

        float scale = Utilities.mapRange(verticalShift, 1, mMaxLauncherScale);

        mTmpMatrix.setScale(scale, scale,

                app.localBounds.exactCenterX(), app.localBounds.exactCenterY());

        builder.withMatrix(mTmpMatrix).withAlpha(alpha);

    }



    @Override
@@ -85,30 +119,61 @@ public class FallbackSwipeHandler extends 
        }

    }



    private class FallbackHomeAnimationFactory extends HomeAnimationFactory

            implements TransformParams.BuilderProxy {

    private class FallbackHomeAnimationFactory extends HomeAnimationFactory {



        private final TransformParams mHomeAlphaParams = new TransformParams();

        private final AnimatedFloat mHomeAlpha = new AnimatedFloat(this::updateHomeAlpha);

        private final AnimatedFloat mHomeAlpha;



        private final AnimatedFloat mVerticalShiftForScale = new AnimatedFloat();



        private final AnimatedFloat mRecentsAlpha = new AnimatedFloat();



        private final long mDuration;

        FallbackHomeAnimationFactory(long duration) {

            super(null);

            mDuration = duration;



            if (mRunningOverHome) {

                mHomeAlpha = new AnimatedFloat();

                mHomeAlpha.value = Utilities.boundToRange(1 - mCurrentShift.value, 0, 1);

                mVerticalShiftForScale.value = mCurrentShift.value;

                mTransformParams.setHomeBuilderProxy(

                        this::updateHomeActivityTransformDuringHomeAnim);

            } else {

                mHomeAlpha = new AnimatedFloat(this::updateHomeAlpha);

                mHomeAlpha.value = 0;



                mHomeAlphaParams.setHomeBuilderProxy(

                        this::updateHomeActivityTransformDuringHomeAnim);

            }



            mRecentsAlpha.value = 1;

            mTransformParams.setBaseBuilderProxy(

                    this::updateRecentsActivityTransformDuringHomeAnim);

        }



        private void updateRecentsActivityTransformDuringHomeAnim(SurfaceParams.Builder builder,

                RemoteAnimationTargetCompat app, TransformParams params) {

            builder.withAlpha(mRecentsAlpha.value);

        }



        private void updateHomeActivityTransformDuringHomeAnim(SurfaceParams.Builder builder,

                RemoteAnimationTargetCompat app, TransformParams params) {

            setHomeScaleAndAlpha(builder, app, mVerticalShiftForScale.value, mHomeAlpha.value);

        }



        @NonNull

        @Override

        public AnimatorPlaybackController createActivityAnimationToHome() {

            PendingAnimation pa = new PendingAnimation(mDuration);

            pa.setFloat(mHomeAlpha, AnimatedFloat.VALUE, 1, LINEAR);

            pa.setFloat(mRecentsAlpha, AnimatedFloat.VALUE, 0, ACCEL);

            return pa.createPlaybackController();

        }



        private void updateHomeAlpha() {

            mHomeAlphaParams.setProgress(mHomeAlpha.value);

            if (mHomeAlphaParams.getTargetSet() != null) {

                mHomeAlphaParams.applySurfaceParams(mHomeAlphaParams.createSurfaceParams(this));

                mHomeAlphaParams.applySurfaceParams(

                        mHomeAlphaParams.createSurfaceParams(BuilderProxy.NO_OP));

            }

        }
@@ -125,7 +190,23 @@ public class FallbackSwipeHandler extends 
        }



        @Override

        public void onBuildParams(Builder builder, RemoteAnimationTargetCompat app, int targetMode,

                TransformParams params) { }

        public void playAtomicAnimation(float velocity) {

            ObjectAnimator alphaAnim = mHomeAlpha.animateToValue(mHomeAlpha.value, 1);

            alphaAnim.setDuration(mDuration).setInterpolator(ACCEL);

            alphaAnim.start();



            if (mRunningOverHome) {

                // Spring back launcher scale

                new SpringAnimationBuilder(mContext)

                        .setStartValue(mVerticalShiftForScale.value)

                        .setEndValue(0)

                        .setStartVelocity(-velocity / mTransitionDragLength)

                        .setMinimumVisibleChange(1f / mDp.heightPx)

                        .setDampingRatio(0.6f)

                        .setStiffness(800)

                        .build(mVerticalShiftForScale, AnimatedFloat.VALUE)

                        .start();

            }

        }

    }

}

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

+0 −20
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.content.Intent; 
import android.content.res.Configuration;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.view.View;
@@ -51,7 +50,6 @@ import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory; 
import com.android.launcher3.statemanager.StateManager.StateHandler;

import com.android.launcher3.statemanager.StatefulActivity;

import com.android.launcher3.util.ActivityTracker;

import com.android.launcher3.util.ObjectWrapper;

import com.android.launcher3.util.SystemUiController;

import com.android.launcher3.util.Themes;

import com.android.launcher3.views.BaseDragLayer;
@@ -62,7 +60,6 @@ import com.android.quickstep.fallback.RecentsState; 
import com.android.quickstep.util.RecentsAtomicAnimationFactory;

import com.android.quickstep.views.OverviewActionsView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.ThumbnailData;

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

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

import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
@@ -77,8 +74,6 @@ import java.io.PrintWriter; 
 */

public final class RecentsActivity extends StatefulActivity<RecentsState> {



    public static final String EXTRA_THUMBNAIL = "thumbnailData";

    public static final String EXTRA_TASK_ID = "taskID";

    public static final ActivityTracker<RecentsActivity> ACTIVITY_TRACKER =

            new ActivityTracker<>();
@@ -118,21 +113,6 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 


    @Override

    protected void onNewIntent(Intent intent) {

        if (intent.getExtras() != null) {

            int taskID = intent.getIntExtra(EXTRA_TASK_ID, 0);

            IBinder thumbnail = intent.getExtras().getBinder(EXTRA_THUMBNAIL);

            if (taskID != 0 && thumbnail instanceof ObjectWrapper) {

                ObjectWrapper<ThumbnailData> obj = (ObjectWrapper<ThumbnailData>) thumbnail;

                ThumbnailData thumbnailData = obj.get();

                mFallbackRecentsView.showCurrentTask(taskID);

                mFallbackRecentsView.updateThumbnail(taskID, thumbnailData);

                // Clear the ref since any reference to the extras on the system side will still

                // hold a reference to the wrapper

                obj.clear();

            }

        }

        intent.removeExtra(EXTRA_TASK_ID);

        intent.removeExtra(EXTRA_THUMBNAIL);

        super.onNewIntent(intent);

        ACTIVITY_TRACKER.handleNewIntent(this, intent);

    }

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

+1 −6
Original line number Diff line number Diff line
@@ -143,9 +143,6 @@ public final class TaskViewUtils { 
        boolean parallaxCenterAndAdjacentTask = taskIndex != recentsView.getCurrentPage();

        int startScroll = recentsView.getScrollOffset(taskIndex);



        params.setProgress(1);

        out.setFloat(params, TransformParams.PROGRESS, 0, TOUCH_RESPONSE_INTERPOLATOR);



        Context context = v.getContext();

        DeviceProfile dp = BaseActivity.fromContext(context).getDeviceProfile();

        // RecentsView never updates the display rotation until swipe-up so the value may be stale.
@@ -173,9 +170,7 @@ public final class TaskViewUtils { 
        }



        // Fade in the task during the initial 20% of the animation

        AnimatedFloat taskAlpha = new AnimatedFloat(() -> { });

        params.setTaskAlphaCallback((t, alpha) -> taskAlpha.value);

        out.addFloat(taskAlpha, AnimatedFloat.VALUE, 0, 1, clampToProgress(LINEAR, 0, 0.2f));

        out.addFloat(params, TransformParams.TARGET_ALPHA, 0, 1, clampToProgress(LINEAR, 0, 0.2f));



        if (!skipViewChanges && parallaxCenterAndAdjacentTask && topMostSimulator != null) {

            out.addFloat(v, VIEW_ALPHA, 1, 0, clampToProgress(LINEAR, 0.2f, 0.4f));