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

Commit 925768d3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix issues with starting new recents animation before previous... 

Merge "Fix issues with starting new recents animation before previous onRecentsAnimationStart" into sc-dev am: 1a453f15

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16471461

Change-Id: Ia6ddad23a2ebaa5737ffe12ce91501ec23dc8489
parents 4d6831e2 1a453f15

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+4 −1
Original line number Diff line number Diff line
@@ -976,6 +976,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                isFling, isCancel);

        // Set the state, but don't notify until the animation completes

        mGestureState.setEndTarget(endTarget, false /* isAtomic */);

        mAnimationFactory.setEndTarget(endTarget);



        float endShift = endTarget.isLauncher ? 1 : 0;

        final float startShift;
@@ -1360,7 +1361,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
            mActivity.clearRunOnceOnStartCallback();

            resetLauncherListeners();

        }

        if (mGestureState.getEndTarget() != null && !mGestureState.isRunningAnimationToLauncher()) {

        if (mGestureState.isRecentsAnimationRunning() && mGestureState.getEndTarget() != null

                && !mGestureState.getEndTarget().isLauncher) {

            // Continued quick switch.

            cancelCurrentAnimation();

        } else {

            mStateCallback.setStateOnUiThread(STATE_FINISH_WITH_NO_END);

quickstep/src/com/android/quickstep/BaseActivityInterface.java

+13 −3
Original line number Diff line number Diff line
@@ -77,12 +77,14 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T 


    public final boolean rotationSupportedByActivity;



    private final STATE_TYPE mOverviewState, mBackgroundState;

    private final STATE_TYPE mBackgroundState;



    private STATE_TYPE mTargetState;



    protected BaseActivityInterface(boolean rotationSupportedByActivity,

            STATE_TYPE overviewState, STATE_TYPE backgroundState) {

        this.rotationSupportedByActivity = rotationSupportedByActivity;

        mOverviewState = overviewState;

        mTargetState = overviewState;

        mBackgroundState = backgroundState;

    }
@@ -399,6 +401,9 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T 
        default boolean isRecentsAttachedToAppWindow() {

            return false;

        }



        /** Called when the gesture ends and we know what state it is going towards */

        default void setEndTarget(GestureState.GestureEndTarget endTarget) { }

    }



    class DefaultAnimationFactory implements AnimationFactory {
@@ -435,7 +440,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T 


            // Since we are changing the start position of the UI, reapply the state, at the end

            controller.setEndAction(() -> mActivity.getStateManager().goToState(

                    controller.getInterpolatedProgress() > 0.5 ? mOverviewState : mBackgroundState,

                    controller.getInterpolatedProgress() > 0.5 ? mTargetState : mBackgroundState,

                    false));



            RecentsView recentsView = mActivity.getOverviewPanel();
@@ -490,6 +495,11 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T 
            return mIsAttachedToWindow;

        }



        @Override

        public void setEndTarget(GestureState.GestureEndTarget endTarget) {

            mTargetState = stateFromGestureEndTarget(endTarget);

        }



        protected void createBackgroundToOverviewAnim(ACTIVITY_TYPE activity, PendingAnimation pa) {

            //  Scale down recents from being full screen to being in overview.

            RecentsView recentsView = activity.getOverviewPanel();

quickstep/src/com/android/quickstep/GestureState.java

+2 −2
Original line number Diff line number Diff line
@@ -346,8 +346,8 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL 
     * @return whether the recents animation is started but not yet ended

     */

    public boolean isRecentsAnimationRunning() {

        return mStateCallback.hasStates(STATE_RECENTS_ANIMATION_INITIALIZED) &&

                !mStateCallback.hasStates(STATE_RECENTS_ANIMATION_ENDED);

        return mStateCallback.hasStates(STATE_RECENTS_ANIMATION_STARTED)

                && !mStateCallback.hasStates(STATE_RECENTS_ANIMATION_ENDED);

    }



    @Override

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+7 −0
Original line number Diff line number Diff line
@@ -106,6 +106,13 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
        // But force-finish it anyways

        finishRunningRecentsAnimation(false /* toHome */);



        if (mCallbacks != null) {

            // If mCallbacks still != null, that means we are getting this startRecentsAnimation()

            // before the previous one got onRecentsAnimationStart(). In that case, cleanup the

            // previous animation so it doesn't mess up/listen to state changes in this animation.

            cleanUpRecentsAnimation();

        }



        final BaseActivityInterface activityInterface = gestureState.getActivityInterface();

        mLastGestureState = gestureState;

        mCallbacks = new RecentsAnimationCallbacks(activityInterface.allowMinimizeSplitScreen());