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

Commit 003782f9 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Removing some properties out of AnimationBuilder 

AnimationBuilder and PendingAnimation have similar logic. This will
allow to unify the two classes

Change-Id: Id8c1d8a7020d132adbccdc6c80538ed6556cb75e
parent 8780065f

quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP; 
import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;

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

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

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

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

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_SCALE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_HOTSEAT_TRANSLATE;
@@ -220,7 +220,7 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti 
                LauncherStateManager stateManager = mLauncher.getStateManager();

                return stateManager.createAtomicAnimation(

                        stateManager.getCurrentStableState(), OVERVIEW, builder,

                        ANIM_ALL, ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW);

                        ANIM_ALL_COMPONENTS, ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW);

            }



            default:

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

+8 −11
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import androidx.annotation.NonNull; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager.AnimationConfig;

import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.PropertySetter;

import com.android.quickstep.views.ClearAllButton;
@@ -64,20 +65,16 @@ public final class RecentsViewStateController extends 
            @NonNull AnimatorSetBuilder builder, @NonNull AnimationConfig config) {

        super.setStateWithAnimationInternal(toState, builder, config);



        if (!toState.overviewUi) {

            builder.addOnFinishRunnable(mRecentsView::resetTaskVisuals);

        }



        ValueAnimator updateAnim = ValueAnimator.ofFloat(0, 1).setDuration(config.duration);

        if (toState.overviewUi) {

            ValueAnimator updateAnim = ValueAnimator.ofFloat(0, 1);

            updateAnim.addUpdateListener(valueAnimator -> {

            // While animating into recents, update the visible task data as needed

                mRecentsView.loadVisibleTaskData();

            });

            updateAnim.setDuration(config.duration);

            builder.play(updateAnim);

            updateAnim.addUpdateListener(valueAnimator -> mRecentsView.loadVisibleTaskData());

            mRecentsView.updateEmptyMessage();

        } else {

            updateAnim.addListener(

                    AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));

        }

        builder.play(updateAnim);



        PropertySetter propertySetter = config.getPropertySetter(builder);

        setAlphas(propertySetter, toState.getVisibleElements(mLauncher));

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java

+10 −5
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ import static com.android.launcher3.LauncherState.ALL_APPS; 
import static com.android.launcher3.LauncherState.NORMAL;

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

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

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

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

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

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_HEADER_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
@@ -43,6 +44,7 @@ import android.view.ViewConfiguration; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppTransitionManagerImpl;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager.AnimationFlags;

import com.android.launcher3.anim.AnimationSuccessListener;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.Interpolators;
@@ -104,7 +106,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
        LauncherState toState = isPaused ? OVERVIEW_PEEK : NORMAL;

        long peekDuration = isPaused ? PEEK_IN_ANIM_DURATION : PEEK_OUT_ANIM_DURATION;

        mPeekAnim = mLauncher.getStateManager().createAtomicAnimation(fromState, toState,

                new AnimatorSetBuilder(), ATOMIC_OVERVIEW_PEEK_COMPONENT, peekDuration);

                new AnimatorSetBuilder(), PLAY_ATOMIC_OVERVIEW_PEEK, peekDuration);

        mPeekAnim.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {
@@ -210,7 +212,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
                super.onAnimationEnd(animation);

                if (mCancelled) {

                    mPeekAnim = mLauncher.getStateManager().createAtomicAnimation(mFromState,

                            mToState, new AnimatorSetBuilder(), ATOMIC_OVERVIEW_PEEK_COMPONENT,

                            mToState, new AnimatorSetBuilder(), PLAY_ATOMIC_OVERVIEW_PEEK,

                            PEEK_OUT_ANIM_DURATION);

                    mPeekAnim.start();

                }
@@ -237,11 +239,14 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
    }



    @Override

    protected void updateAnimatorBuilderOnReinit(AnimatorSetBuilder builder) {

    @AnimationFlags

    protected int updateAnimComponentsOnReinit(@AnimationFlags int animComponents) {

        if (handlingOverviewAnim()) {

            // We don't want the state transition to all apps to animate overview,

            // as that will cause a jump after our atomic animation.

            builder.addFlag(AnimatorSetBuilder.FLAG_DONT_ANIMATE_OVERVIEW);

            return animComponents | SKIP_OVERVIEW;

        } else {

            return animComponents;

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.launcher3.uioverrides.touchcontrollers; 
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.LauncherStateManager.ATOMIC_OVERVIEW_PEEK_COMPONENT;

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

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

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

import static com.android.launcher3.util.VibratorWrapper.OVERVIEW_HAPTIC;
@@ -175,7 +175,7 @@ public class NoButtonNavbarToOverviewTouchController extends FlingAndHoldTouchCo 
                long duration = OVERVIEW.getTransitionDuration(mLauncher);

                AnimatorSet anim = stateManager.createAtomicAnimation(

                        stateManager.getState(), NORMAL, builder,

                        ATOMIC_OVERVIEW_PEEK_COMPONENT, duration);

                        PLAY_ATOMIC_OVERVIEW_PEEK, duration);

                anim.addListener(AnimationSuccessListener.forRunnable(

                        () -> onSwipeInteractionCompleted(NORMAL, Touch.SWIPE)));

                anim.start();

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

+6 −7
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ import static com.android.launcher3.LauncherState.HOTSEAT_ICONS; 
import static com.android.launcher3.LauncherState.NORMAL;

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

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

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

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

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

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

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;

import static com.android.launcher3.anim.AnimatorSetBuilder.FLAG_DONT_ANIMATE_OVERVIEW;

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

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

import static com.android.launcher3.anim.Interpolators.DEACCEL_5;
@@ -55,8 +55,8 @@ import android.view.animation.Interpolator; 


import com.android.launcher3.BaseQuickstepLauncher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager;

import com.android.launcher3.LauncherStateManager.AnimationConfig;

import com.android.launcher3.LauncherStateManager.AnimationFlags;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.AllAppsTransitionController;
@@ -214,7 +214,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
        nonOverviewBuilder.setInterpolator(ANIM_ALL_APPS_FADE, FADE_OUT_INTERPOLATOR);

        nonOverviewBuilder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, TRANSLATE_OUT_INTERPOLATOR);

        nonOverviewBuilder.setInterpolator(ANIM_VERTICAL_PROGRESS, TRANSLATE_OUT_INTERPOLATOR);

        updateNonOverviewAnim(QUICK_SWITCH, nonOverviewBuilder, ANIM_ALL);

        updateNonOverviewAnim(QUICK_SWITCH, nonOverviewBuilder, ANIM_ALL_COMPONENTS);

        mNonOverviewAnim.dispatchOnStart();



        if (mRecentsView.getTaskViewCount() == 0) {
@@ -231,11 +231,10 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 


    /** Create state animation to control non-overview components. */

    private void updateNonOverviewAnim(LauncherState toState, AnimatorSetBuilder builder,

            @LauncherStateManager.AnimationComponents int animComponents) {

        builder.addFlag(FLAG_DONT_ANIMATE_OVERVIEW);

            @AnimationFlags int animComponents) {

        long accuracy = (long) (Math.max(mXRange, mYRange) * 2);

        mNonOverviewAnim = mLauncher.getStateManager().createAnimationToNewWorkspace(toState,

                builder, accuracy, this::clearState, animComponents);

                builder, accuracy, this::clearState, animComponents | SKIP_OVERVIEW);

    }



    private void setupOverviewAnimators() {