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

Commit 01b32466 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Revert "Revert "Exposing AnimatorListeners in StateManager to receive both... 

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

This reverts commit d7f11d5f.

Reason for revert: Fixed initial error
Bug: 185554764

Change-Id: I32cc49f9b3820166736ceb347f33577939aa6efa
parent e2522016

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

+5 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 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;
@@ -150,7 +151,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, () -> {

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

            if (mPredictedItems.isEmpty()) {

                // launcher has empty predictions set

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

                eduController.showEdu();

            }

        });

        }));

    }



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

        }

        if (animate) {

            animationSet.addListener(AnimationSuccessListener

                    .forRunnable(this::removeOutlineDrawings));

            animationSet.addListener(

                    forSuccessCallback(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.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorListeners;

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(

                    AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));

                    AnimatorListeners.forSuccessCallback(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,6 +22,7 @@ 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.forSuccessCallback;

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;
@@ -38,7 +39,6 @@ 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.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.Interpolators;

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

            } else {

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

                        () -> onSwipeInteractionCompleted(mEndState));

                        forSuccessCallback(() -> onSwipeInteractionCompleted(mEndState)));

            }

            if (mStartState != mEndState) {

                logHomeGesture();
@@ -214,8 +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(AnimationSuccessListener.forRunnable(

                    () -> onSwipeInteractionCompleted(mStartState)));

            anim.addListener(forSuccessCallback(() -> onSwipeInteractionCompleted(mStartState)));

            anim.setDuration(80).start();

        }

    }

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

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 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;
@@ -172,13 +173,13 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch 
        }

        mNormalToHintOverviewScrimAnimator = null;

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

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

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

                    mOverviewResistYAnim = AnimatorControllerWithResistance

                            .createRecentsResistanceFromOverviewAnim(mLauncher, null)

                            .createPlaybackController();

                    mReachedOverview = true;

                    maybeSwipeInteractionToOverviewComplete();

                })));

                }))));



        mCurrentAnimation.getTarget().removeListener(mClearStateOnCancelListener);

        mCurrentAnimation.dispatchOnCancel();

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

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 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;
@@ -418,7 +419,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
                        targetState.ordinal > mStartState.ordinal

                                ? LAUNCHER_UNKNOWN_SWIPEUP

                                : LAUNCHER_UNKNOWN_SWIPEDOWN));

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

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

    }



    private void cancelAnimations() {