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

Commit 7120373b authored by Kateryna Ivanova's avatar Kateryna Ivanova
Browse files

Migrate Interpolators from Launcher3 to the public animation library 

Test: atest
Bug: 271850966
Change-Id: Iba999f2e753764a37d35e508e707df02388432e9
parent 5644e3f1

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ android_library { 
    static_libs: [

        "Launcher3ResLib",

        "launcher-testing-shared",

        "animationlib"

    ],

    sdk_version: "current",

    min_sdk_version: min_launcher3_sdk_version,

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

+12 −12
Original line number Diff line number Diff line
@@ -30,6 +30,12 @@ import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_NONE; 
import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_SPLASH_SCREEN;

import static android.window.TransitionFilter.CONTAINER_ORDER_TOP;



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

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

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

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

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

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

import static com.android.launcher3.BaseActivity.INVISIBLE_ALL;

import static com.android.launcher3.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS;

import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
@@ -41,12 +47,6 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP; 
import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.LauncherState.OVERVIEW;

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

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

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

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

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

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

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

import static com.android.launcher3.config.FeatureFlags.ENABLE_BACK_SWIPE_HOME_ANIMATION;

import static com.android.launcher3.config.FeatureFlags.ENABLE_SCRIM_FOR_APP_LAUNCH;

import static com.android.launcher3.config.FeatureFlags.KEYGUARD_ANIMATION;
@@ -553,7 +553,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 


                ObjectAnimator scaleAnim = ObjectAnimator.ofFloat(view, SCALE_PROPERTY, scales)

                        .setDuration(CONTENT_SCALE_DURATION);

                scaleAnim.setInterpolator(DEACCEL_1_5);

                scaleAnim.setInterpolator(DECELERATE_1_5);

                launcherAnimator.play(scaleAnim);

            });
@@ -571,7 +571,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
                    ObjectAnimator scrim = ObjectAnimator.ofArgb(scrimView, VIEW_BACKGROUND_COLOR,

                            colors);

                    scrim.setDuration(CONTENT_SCRIM_DURATION);

                    scrim.setInterpolator(DEACCEL_1_5);

                    scrim.setInterpolator(DECELERATE_1_5);



                    launcherAnimator.play(scrim);

                }
@@ -1462,11 +1462,11 @@ 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, DEACCEL_1_7);

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

            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,

                    DEACCEL_1_7);

                    DECELERATE_1_7);



            @Override

            public void onUpdate(float percent, boolean initOnly) {
@@ -2032,7 +2032,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
            if (progress >= end) {

                return 0f;

            }

            return Utilities.mapToRange(progress, start, end, 1, 0, ACCEL_1_5);

            return Utilities.mapToRange(progress, start, end, 1, 0, ACCELERATE_1_5);

        }

    }

quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.widget.Button; 
import android.widget.LinearLayout;

import android.widget.TextView;



import com.android.app.animation.Interpolators;

import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.CellLayout;

import com.android.launcher3.DeviceProfile;
@@ -37,7 +38,6 @@ import com.android.launcher3.Insettable; 
import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.R;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.celllayout.CellLayoutLayoutParams;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.uioverrides.PredictedAppIcon;

quickstep/src/com/android/launcher3/statehandlers/DepthController.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.launcher3.statehandlers;



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

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

import static com.android.launcher3.states.StateAnimationConfig.ANIM_DEPTH;

import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;

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

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

+1 −1
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.constraintlayout.widget.ConstraintLayout;



import com.android.app.animation.Interpolators;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.anim.AnimatedFloat;

import com.android.launcher3.anim.Interpolators;

import com.android.quickstep.util.GroupTask;



import java.util.HashMap;