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

Commit d7f11d5f authored by Winson Chung's avatar Winson Chung
Browse files

Revert "Exposing AnimatorListeners in StateManager to receive both success and failure callback" 

This reverts commit a75f5768.

Reason for revert: b/187887269
Bug: 187887269

Change-Id: I8a56ff7054e71cf30b113fdaa213397dae0c53cb
parent a75f5768

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

+4 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package com.android.launcher3.hybridhotseat; 


import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;

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

import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;

import static com.android.launcher3.hybridhotseat.HotseatEduController.getSettingsIntent;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_PREDICTION_PINNED;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_RANKED;
@@ -151,7 +150,7 @@ public class HotseatPredictionController implements DragController.DragListener, 
     * Shows appropriate hotseat education based on prediction enabled and migration states.

     */

    public void showEdu() {

        mLauncher.getStateManager().goToState(NORMAL, true, forSuccessCallback(() -> {

        mLauncher.getStateManager().goToState(NORMAL, true, () -> {

            if (mPredictedItems.isEmpty()) {

                // launcher has empty predictions set

                Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_disabled,
@@ -166,7 +165,7 @@ public class HotseatPredictionController implements DragController.DragListener, 
                        .collect(Collectors.toList()));

                eduController.showEdu();

            }

        }));

        });

    }



    /**
@@ -256,8 +255,8 @@ public class HotseatPredictionController implements DragController.DragListener, 
            }

        }

        if (animate) {

            animationSet.addListener(

                    forSuccessCallback(this::removeOutlineDrawings));

            animationSet.addListener(AnimationSuccessListener

                    .forRunnable(this::removeOutlineDrawings));

            animationSet.start();

        } else {

            removeOutlineDrawings();

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

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import androidx.annotation.NonNull; 


import com.android.launcher3.BaseQuickstepLauncher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.anim.AnimatorListeners;

import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.PendingAnimation;

import com.android.launcher3.anim.PropertySetter;

import com.android.launcher3.states.StateAnimationConfig;
@@ -78,7 +78,7 @@ public final class RecentsViewStateController extends 
            mRecentsView.updateEmptyMessage();

        } else {

            builder.addListener(

                    AnimatorListeners.forSuccessCallback(mRecentsView::resetTaskVisuals));

                    AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));

        }



        // Create or dismiss split screen select animations

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

+3 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherAnimUtils.newCancelListener; 
import static com.android.launcher3.LauncherState.ALL_APPS;

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

import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;

import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;

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

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

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE;
@@ -39,7 +38,7 @@ import com.android.launcher3.LauncherState; 
import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.anim.AnimatorListeners;

import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.anim.PendingAnimation;
@@ -200,7 +199,7 @@ public class NavBarToHomeTouchController implements TouchController, 
                        .animateWithVelocity(velocity);

            } else {

                mLauncher.getStateManager().goToState(mEndState, true,

                        forEndCallback(() -> onSwipeInteractionCompleted(mEndState)));

                        () -> onSwipeInteractionCompleted(mEndState));

            }

            if (mStartState != mEndState) {

                logHomeGesture();
@@ -215,7 +214,7 @@ public class NavBarToHomeTouchController implements TouchController, 
            // Quickly return to the state we came from (we didn't move far).

            ValueAnimator anim = mCurrentAnimation.getAnimationPlayer();

            anim.setFloatValues(progress, 0);

            anim.addListener(AnimatorListeners.forSuccessCallback(

            anim.addListener(AnimationSuccessListener.forRunnable(

                    () -> onSwipeInteractionCompleted(mStartState)));

            anim.setDuration(80).start();

        }

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

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static com.android.launcher3.LauncherState.HINT_STATE; 
import static com.android.launcher3.LauncherState.NORMAL;

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

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

import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback;

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

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -173,13 +172,13 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch 
        }

        mNormalToHintOverviewScrimAnimator = null;

        mCurrentAnimation.getTarget().addListener(newCancelListener(() ->

                mLauncher.getStateManager().goToState(OVERVIEW, true, forSuccessCallback(() -> {

                mLauncher.getStateManager().goToState(OVERVIEW, true, () -> {

                    mOverviewResistYAnim = AnimatorControllerWithResistance

                            .createRecentsResistanceFromOverviewAnim(mLauncher, null)

                            .createPlaybackController();

                    mReachedOverview = true;

                    maybeSwipeInteractionToOverviewComplete();

                }))));

                })));



        mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);

        mCurrentAnimation.dispatchOnCancel();

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

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW; 
import static com.android.launcher3.LauncherState.OVERVIEW_ACTIONS;

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

import static com.android.launcher3.anim.AlphaUpdateListener.ALPHA_CUTOFF_THRESHOLD;

import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;

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

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

import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -419,7 +418,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
                        targetState.ordinal > mStartState.ordinal

                                ? LAUNCHER_UNKNOWN_SWIPEUP

                                : LAUNCHER_UNKNOWN_SWIPEDOWN));

        mLauncher.getStateManager().goToState(targetState, false, forEndCallback(this::clearState));

        mLauncher.getStateManager().goToState(targetState, false, this::clearState);

    }



    private void cancelAnimations() {