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

Commit f9d38098 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Fix a couple issues with swiping up from home" into ub-launcher3-edmonton

parents fdf9315b 7de57417

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

+2 −8
Original line number Diff line number Diff line
@@ -189,14 +189,8 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
            if (isFling && expectedDuration != 0) {

                // Update all apps interpolator to add a bit of overshoot starting from currFraction

                final float currFraction = mCurrentAnimation.getProgressFraction();

                mAllAppsInterpolatorWrapper.baseInterpolator

                        = new OvershootInterpolator(Math.min(Math.abs(velocity) / 3, 3f)) {

                    @Override

                    public float getInterpolation(float t) {

                        return super.getInterpolation(t) + ((1 - t) * currFraction);

                    }

                };

                animator.setFloatValues(0, 1);

                mAllAppsInterpolatorWrapper.baseInterpolator = Interpolators.clampToProgress(

                        new OvershootInterpolator(Math.min(Math.abs(velocity), 3f)), currFraction, 1);

                animator.setDuration(Math.min(expectedDuration, ATOMIC_DURATION))

                        .setInterpolator(LINEAR);

            }

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

+7 −5
Original line number Diff line number Diff line
@@ -210,12 +210,14 @@ public abstract class AbstractStateChangeTouchController 
                @Override

                public void onAnimationSuccess(Animator animation) {

                    cancelAtomicComponentsController();

                    if (mCurrentAnimation != null) {

                        mAtomicComponentsStartProgress = mCurrentAnimation.getProgressFraction();

                        long duration = (long) (getShiftRange() * 2);

                        mAtomicComponentsController = AnimatorPlaybackController.wrap(

                                createAtomicAnimForState(mFromState, mToState, duration), duration);

                        mAtomicComponentsController.dispatchOnStart();

                    }

                }

            });

        }

        if (goingBetweenNormalAndOverview(mFromState, mToState)) {