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

Commit d59b6c59 authored by Jon Miranda's avatar Jon Miranda
Browse files

Disable All Apps spring. 

Bug: 147302669
Change-Id: I36cf13e94cf2d418909df345a4e36d827ac7eedf
parent 1c3c3b1d

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

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL; 
import static com.android.launcher3.anim.Interpolators.LINEAR;

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

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

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

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

import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;

import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW;

import static com.android.quickstep.GestureState.GestureEndTarget.HOME;
@@ -972,7 +972,7 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity> 
        }

        mLauncherTransitionController.getAnimationPlayer().setDuration(Math.max(0, duration));



        if (QUICKSTEP_SPRINGS.get()) {

        if (UNSTABLE_SPRINGS.get()) {

            mLauncherTransitionController.dispatchOnStartWithVelocity(end, velocityPxPerMs.y);

        }

        mLauncherTransitionController.getAnimationPlayer().start();

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRE 
import static com.android.launcher3.anim.Interpolators.ACCEL;

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

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

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

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

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



import android.animation.TimeInterpolator;
@@ -277,7 +277,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
    private void handleFirstSwipeToOverview(final ValueAnimator animator,

            final long expectedDuration, final LauncherState targetState, final float velocity,

            final boolean isFling) {

        if (QUICKSTEP_SPRINGS.get() && mFromState == OVERVIEW && mToState == ALL_APPS

        if (UNSTABLE_SPRINGS.get() && mFromState == OVERVIEW && mToState == ALL_APPS

                && targetState == OVERVIEW) {

            mFinishFastOnSecondTouch = true;

        } else  if (mFromState == NORMAL && mToState == OVERVIEW && targetState == OVERVIEW) {

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRE 
import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;

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

import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;

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

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

import static com.android.launcher3.util.SystemUiController.UI_STATE_ALL_APPS;



import android.animation.Animator;
@@ -185,7 +185,7 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil 
    }



    public Animator createSpringAnimation(float... progressValues) {

        if (QUICKSTEP_SPRINGS.get()) {

        if (UNSTABLE_SPRINGS.get()) {

            return new SpringObjectAnimator<>(this, ALL_APPS_PROGRESS, 1f / mShiftRange,

                    SPRING_DAMPING_RATIO, SPRING_STIFFNESS, progressValues);

        }

src/com/android/launcher3/touch/AbstractStateChangeTouchController.java

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import static com.android.launcher3.LauncherStateManager.ANIM_ALL; 
import static com.android.launcher3.LauncherStateManager.ATOMIC_OVERVIEW_SCALE_COMPONENT;

import static com.android.launcher3.LauncherStateManager.NON_ATOMIC_COMPONENT;

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

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

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

import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;



import android.animation.Animator;
@@ -435,7 +435,7 @@ public abstract class AbstractStateChangeTouchController 
        updateSwipeCompleteAnimation(anim, Math.max(duration, getRemainingAtomicDuration()),

                targetState, velocity, fling);

        mCurrentAnimation.dispatchOnStartWithVelocity(endProgress, progressVelocity);

        if (fling && targetState == LauncherState.ALL_APPS && !QUICKSTEP_SPRINGS.get()) {

        if (fling && targetState == LauncherState.ALL_APPS && !UNSTABLE_SPRINGS.get()) {

            mLauncher.getAppsView().addSpringFromFlingUpdateListener(anim, velocity);

        }

        anim.start();