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

Commit df71298a authored by Sunny Goyal's avatar Sunny Goyal Committed by Vinit Nayak
Browse files

Using fractions in MultiValueUpdateListener instead of absolute durations 

This ensures that any global animation scale applies properly

Bug: 327645429
Flag: NONE
Test: Manual
Change-Id: I12205429dca5a87208fa9964b3307fb718af4fd0
(cherry picked from commit f584b328)
parent acec0efb

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

+46 −46
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATI 
import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;

import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;

import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;

import static com.android.quickstep.util.AnimUtils.clampToDuration;

import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback;

import static com.android.systemui.shared.system.QuickStepContract.getWindowCornerRadius;

import static com.android.systemui.shared.system.QuickStepContract.supportsRoundedCornersOnWindows;
@@ -748,34 +749,35 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        final float finalShadowRadius = appTargetsAreTranslucent ? 0 : mMaxShadowRadius;



        MultiValueUpdateListener listener = new MultiValueUpdateListener() {

            FloatProp mDx = new FloatProp(0, prop.dX, 0, APP_LAUNCH_DURATION,

                    mOpeningXInterpolator);

            FloatProp mDy = new FloatProp(0, prop.dY, 0, APP_LAUNCH_DURATION,

                    mOpeningInterpolator);

            FloatProp mDx = new FloatProp(0, prop.dX, mOpeningXInterpolator);

            FloatProp mDy = new FloatProp(0, prop.dY, mOpeningInterpolator);



            FloatProp mIconScaleToFitScreen = new FloatProp(prop.initialAppIconScale,

                    prop.finalAppIconScale, 0, APP_LAUNCH_DURATION, mOpeningInterpolator);

                    prop.finalAppIconScale, mOpeningInterpolator);

            FloatProp mIconAlpha = new FloatProp(prop.iconAlphaStart, 0f,

                    APP_LAUNCH_ALPHA_START_DELAY, APP_LAUNCH_ALPHA_DURATION, LINEAR);

                    clampToDuration(LINEAR, APP_LAUNCH_ALPHA_START_DELAY, APP_LAUNCH_ALPHA_DURATION,

                            APP_LAUNCH_DURATION));



            FloatProp mWindowRadius = new FloatProp(initialWindowRadius, finalWindowRadius, 0,

                    APP_LAUNCH_DURATION, mOpeningInterpolator);

            FloatProp mShadowRadius = new FloatProp(0, finalShadowRadius, 0,

                    APP_LAUNCH_DURATION, mOpeningInterpolator);

            FloatProp mWindowRadius = new FloatProp(initialWindowRadius, finalWindowRadius,

                    mOpeningInterpolator);

            FloatProp mShadowRadius = new FloatProp(0, finalShadowRadius,

                    mOpeningInterpolator);



            FloatProp mCropRectCenterX = new FloatProp(prop.cropCenterXStart, prop.cropCenterXEnd,

                    0, APP_LAUNCH_DURATION, mOpeningInterpolator);

                    mOpeningInterpolator);

            FloatProp mCropRectCenterY = new FloatProp(prop.cropCenterYStart, prop.cropCenterYEnd,

                    0, APP_LAUNCH_DURATION, mOpeningInterpolator);

            FloatProp mCropRectWidth = new FloatProp(prop.cropWidthStart, prop.cropWidthEnd, 0,

                    APP_LAUNCH_DURATION, mOpeningInterpolator);

            FloatProp mCropRectHeight = new FloatProp(prop.cropHeightStart, prop.cropHeightEnd, 0,

                    APP_LAUNCH_DURATION, mOpeningInterpolator);

                    mOpeningInterpolator);

            FloatProp mCropRectWidth = new FloatProp(prop.cropWidthStart, prop.cropWidthEnd,

                    mOpeningInterpolator);

            FloatProp mCropRectHeight = new FloatProp(prop.cropHeightStart, prop.cropHeightEnd,

                    mOpeningInterpolator);



            FloatProp mNavFadeOut = new FloatProp(1f, 0f, 0, ANIMATION_NAV_FADE_OUT_DURATION,

                    NAV_FADE_OUT_INTERPOLATOR);

            FloatProp mNavFadeIn = new FloatProp(0f, 1f, ANIMATION_DELAY_NAV_FADE_IN,

                    ANIMATION_NAV_FADE_IN_DURATION, NAV_FADE_IN_INTERPOLATOR);

            FloatProp mNavFadeOut = new FloatProp(1f, 0f, clampToDuration(

                    NAV_FADE_OUT_INTERPOLATOR, 0, ANIMATION_NAV_FADE_OUT_DURATION,

                    APP_LAUNCH_DURATION));

            FloatProp mNavFadeIn = new FloatProp(0f, 1f, clampToDuration(

                    NAV_FADE_IN_INTERPOLATOR, ANIMATION_DELAY_NAV_FADE_IN,

                    ANIMATION_NAV_FADE_IN_DURATION, APP_LAUNCH_DURATION));



            @Override

            public void onUpdate(float percent, boolean initOnly) {
@@ -968,37 +970,36 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 


        appAnimator.addUpdateListener(new MultiValueUpdateListener() {

            float mAppWindowScale = 1;

            final FloatProp mWidgetForegroundAlpha = new FloatProp(1 /* start */,

                    0 /* end */, 0 /* delay */,

                    WIDGET_CROSSFADE_DURATION_MILLIS / 2 /* duration */, LINEAR);

            final FloatProp mWidgetFallbackBackgroundAlpha = new FloatProp(0 /* start */,

                    1 /* end */, 0 /* delay */, 75 /* duration */, LINEAR);

            final FloatProp mPreviewAlpha = new FloatProp(0 /* start */, 1 /* end */,

            final FloatProp mWidgetForegroundAlpha = new FloatProp(1, 0, clampToDuration(

                    LINEAR, 0, WIDGET_CROSSFADE_DURATION_MILLIS / 2, APP_LAUNCH_DURATION));



            final FloatProp mWidgetFallbackBackgroundAlpha = new FloatProp(0, 1,

                    clampToDuration(LINEAR, 0, 75, APP_LAUNCH_DURATION));

            final FloatProp mPreviewAlpha = new FloatProp(0, 1, clampToDuration(

                    LINEAR,

                    WIDGET_CROSSFADE_DURATION_MILLIS / 2 /* delay */,

                    WIDGET_CROSSFADE_DURATION_MILLIS / 2 /* duration */, LINEAR);

                    WIDGET_CROSSFADE_DURATION_MILLIS / 2 /* duration */,

                    APP_LAUNCH_DURATION));

            final FloatProp mWindowRadius = new FloatProp(initialWindowRadius, finalWindowRadius,

                    0 /* start */, APP_LAUNCH_DURATION, mOpeningInterpolator);

            final FloatProp mCornerRadiusProgress = new FloatProp(0, 1, 0, APP_LAUNCH_DURATION,

                    mOpeningInterpolator);

            final FloatProp mCornerRadiusProgress = new FloatProp(0, 1, mOpeningInterpolator);



            // Window & widget background positioning bounds

            final FloatProp mDx = new FloatProp(widgetBackgroundBounds.centerX(),

                    windowTargetBounds.centerX(), 0 /* delay */, APP_LAUNCH_DURATION,

                    mOpeningXInterpolator);

                    windowTargetBounds.centerX(), mOpeningXInterpolator);

            final FloatProp mDy = new FloatProp(widgetBackgroundBounds.centerY(),

                    windowTargetBounds.centerY(), 0 /* delay */, APP_LAUNCH_DURATION,

                    mOpeningInterpolator);

                    windowTargetBounds.centerY(), mOpeningInterpolator);

            final FloatProp mWidth = new FloatProp(widgetBackgroundBounds.width(),

                    windowTargetBounds.width(), 0 /* delay */, APP_LAUNCH_DURATION,

                    mOpeningInterpolator);

                    windowTargetBounds.width(), mOpeningInterpolator);

            final FloatProp mHeight = new FloatProp(widgetBackgroundBounds.height(),

                    windowTargetBounds.height(), 0 /* delay */, APP_LAUNCH_DURATION,

                    mOpeningInterpolator);

                    windowTargetBounds.height(), mOpeningInterpolator);



            final FloatProp mNavFadeOut = new FloatProp(1f, 0f, 0, ANIMATION_NAV_FADE_OUT_DURATION,

                    NAV_FADE_OUT_INTERPOLATOR);

            final FloatProp mNavFadeIn = new FloatProp(0f, 1f, ANIMATION_DELAY_NAV_FADE_IN,

                    ANIMATION_NAV_FADE_IN_DURATION, NAV_FADE_IN_INTERPOLATOR);

            final FloatProp mNavFadeOut = new FloatProp(1f, 0f, clampToDuration(

                    NAV_FADE_OUT_INTERPOLATOR, 0, ANIMATION_NAV_FADE_OUT_DURATION,

                    APP_LAUNCH_DURATION));

            final FloatProp mNavFadeIn = new FloatProp(0f, 1f, clampToDuration(

                    NAV_FADE_IN_INTERPOLATOR, ANIMATION_DELAY_NAV_FADE_IN,

                    ANIMATION_NAV_FADE_IN_DURATION, APP_LAUNCH_DURATION));



            @Override

            public void onUpdate(float percent, boolean initOnly) {
@@ -1508,11 +1509,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        float startShadowRadius = areAllTargetsTranslucent(appTargets) ? 0 : mMaxShadowRadius;

        closingAnimator.setDuration(duration);

        closingAnimator.addUpdateListener(new MultiValueUpdateListener() {

            FloatProp mDy = new FloatProp(0, mClosingWindowTransY, 0, duration, DECELERATE_1_7);

            FloatProp mScale = new FloatProp(1f, 1f, 0, duration, DECELERATE_1_7);

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

            FloatProp mShadowRadius = new FloatProp(startShadowRadius, 0, 0, duration,

                    DECELERATE_1_7);

            FloatProp mDy = new FloatProp(0, mClosingWindowTransY, DECELERATE_1_7);

            FloatProp mScale = new FloatProp(1f, 1f, DECELERATE_1_7);

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

            FloatProp mShadowRadius = new FloatProp(startShadowRadius, 0, DECELERATE_1_7);



            @Override

            public void onUpdate(float percent, boolean initOnly) {

quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java

+4 −9
Original line number Diff line number Diff line
@@ -686,15 +686,10 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im 
        float toScale = iconSize / mDragIconSize;

        float toAlpha = (target == originalView) ? 1f : 0f;

        MultiValueUpdateListener listener = new MultiValueUpdateListener() {

            final FloatProp mDx = new FloatProp(fromX, toPosition[0], 0,

                    ANIM_DURATION_RETURN_ICON_TO_TASKBAR, Interpolators.FAST_OUT_SLOW_IN);

            final FloatProp mDy = new FloatProp(fromY, toPosition[1], 0,

                    ANIM_DURATION_RETURN_ICON_TO_TASKBAR,

                    FAST_OUT_SLOW_IN);

            final FloatProp mScale = new FloatProp(1f, toScale, 0,

                    ANIM_DURATION_RETURN_ICON_TO_TASKBAR, FAST_OUT_SLOW_IN);

            final FloatProp mAlpha = new FloatProp(1f, toAlpha, 0,

                    ANIM_DURATION_RETURN_ICON_TO_TASKBAR, Interpolators.ACCELERATE_2);

            final FloatProp mDx = new FloatProp(fromX, toPosition[0], FAST_OUT_SLOW_IN);

            final FloatProp mDy = new FloatProp(fromY, toPosition[1], FAST_OUT_SLOW_IN);

            final FloatProp mScale = new FloatProp(1f, toScale, FAST_OUT_SLOW_IN);

            final FloatProp mAlpha = new FloatProp(1f, toAlpha, Interpolators.ACCELERATE_2);

            @Override

            public void onUpdate(float percent, boolean initOnly) {

                animListener.updateDragShadow(mDx.value, mDy.value, mScale.value, mAlpha.value);

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

+11 −4
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import static com.android.launcher3.QuickstepTransitionManager.SPLIT_DIVIDER_ANI 
import static com.android.launcher3.QuickstepTransitionManager.SPLIT_LAUNCH_DURATION;

import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;

import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE;

import static com.android.quickstep.util.AnimUtils.clampToDuration;

import static com.android.quickstep.views.DesktopTaskView.isDesktopModeSupported;



import android.animation.Animator;
@@ -267,10 +268,16 @@ public final class TaskViewUtils { 
            if (navBarTarget != null) {

                final Rect cropRect = new Rect();

                out.addOnFrameListener(new MultiValueUpdateListener() {

                    FloatProp mNavFadeOut = new FloatProp(1f, 0f, 0,

                            ANIMATION_NAV_FADE_OUT_DURATION, NAV_FADE_OUT_INTERPOLATOR);

                    FloatProp mNavFadeIn = new FloatProp(0f, 1f, ANIMATION_DELAY_NAV_FADE_IN,

                            ANIMATION_NAV_FADE_IN_DURATION, NAV_FADE_IN_INTERPOLATOR);

                    FloatProp mNavFadeOut = new FloatProp(1f, 0f, clampToDuration(

                            NAV_FADE_OUT_INTERPOLATOR,

                            0,

                            ANIMATION_NAV_FADE_OUT_DURATION,

                            out.getDuration()));

                    FloatProp mNavFadeIn = new FloatProp(0f, 1f, clampToDuration(

                            NAV_FADE_IN_INTERPOLATOR,

                            ANIMATION_DELAY_NAV_FADE_IN,

                            ANIMATION_NAV_FADE_IN_DURATION,

                            out.getDuration()));



                    @Override

                    public void onUpdate(float percent, boolean initOnly) {

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

+13 −0
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ 


package com.android.quickstep.util;



import static com.android.app.animation.Interpolators.clampToProgress;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;



import android.os.Bundle;

import android.os.IRemoteCallback;

import android.view.animation.Interpolator;



import com.android.launcher3.util.RunnableList;
@@ -67,4 +69,15 @@ public class AnimUtils { 
            }

        };

    }



    /**

     * Returns a function that runs the given interpolator such that the entire progress is set

     * between the given duration. That is, we set the interpolation to 0 until startDelay and reach

     * 1 by (startDelay + duration).

     */

    public static Interpolator clampToDuration(Interpolator interpolator, float startDelay,

            float duration, float totalDuration) {

        return clampToProgress(interpolator, startDelay / totalDuration,

                (startDelay + duration) / totalDuration);

    }

}

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

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.quickstep.util;



import android.annotation.FloatRange;

import android.annotation.IntRange;



/*

 * Adds getter methods to {@link MultiValueUpdateListener} specific to app close animation,

 * so that the entire animation can be defined in one place.

 */

public abstract class AppCloseConfig extends MultiValueUpdateListener {



    /**

     * Returns the translation y of the workspace contents.

     */

    public abstract float getWorkspaceTransY();



    /*

     * Returns the scale of the workspace contents.

     */

    public abstract float getWorkspaceScale();



    /*

     * Returns the alpha of the window.

     */

    public abstract @FloatRange(from = 0, to = 1) float getWindowAlpha();



    /*

     * Returns the alpha of the foreground layer of an adaptive icon.

     */

    public abstract @IntRange(from = 0, to = 255) int getFgAlpha();



    /*

     * Returns the corner radius of the window and icon.

     */

    public abstract float getCornerRadius();



    /*

     * Returns the interpolated progress of the animation.

     */

    public abstract float getInterpolatedProgress();



}