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

Commit a5a732d0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6309957 from c83758f2 to rvc-release 

Change-Id: I36cca218b11018f130e0c028682eac0ab8c159c5
parents efed838c c83758f2

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

+15 −13
Original line number Diff line number Diff line
@@ -20,15 +20,14 @@ 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_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;

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

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

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

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

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

import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_SCALE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_TRANSLATE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;

import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;

import static com.android.quickstep.TaskViewUtils.getRecentsWindowAnimator;
@@ -47,9 +46,9 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.LauncherState.ScaleAndTranslation;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.anim.SpringAnimationBuilder;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.touch.PagedOrientationHandler;

import com.android.quickstep.util.AppWindowAnimationHelper;

import com.android.quickstep.views.RecentsView;
@@ -210,17 +209,20 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti 
                        .setValues(values)

                        .build(mLauncher);

            case INDEX_PAUSE_TO_OVERVIEW_ANIM: {

                AnimatorSetBuilder builder = new AnimatorSetBuilder();

                builder.setInterpolator(ANIM_VERTICAL_PROGRESS, OVERSHOOT_1_2);

                builder.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_3);

                StateAnimationConfig config = new StateAnimationConfig();

                config.duration = ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW;



                config.setInterpolator(ANIM_VERTICAL_PROGRESS, OVERSHOOT_1_2);

                config.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_3);

                if ((OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0) {

                    builder.setInterpolator(ANIM_HOTSEAT_SCALE, OVERSHOOT_1_2);

                    builder.setInterpolator(ANIM_HOTSEAT_TRANSLATE, OVERSHOOT_1_2);

                    config.setInterpolator(ANIM_HOTSEAT_SCALE, OVERSHOOT_1_2);

                    config.setInterpolator(ANIM_HOTSEAT_TRANSLATE, OVERSHOOT_1_2);

                }





                LauncherStateManager stateManager = mLauncher.getStateManager();

                return stateManager.createAtomicAnimation(

                        stateManager.getCurrentStableState(), OVERVIEW, builder,

                        ANIM_ALL_COMPONENTS, ATOMIC_DURATION_FROM_PAUSED_TO_OVERVIEW);

                        stateManager.getCurrentStableState(), OVERVIEW, config);

            }



            default:

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

+10 −14
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.launcher3.anim.Interpolators.LINEAR; 
import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;

import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;



import android.animation.ValueAnimator;

import android.annotation.TargetApi;

import android.os.Build;

import android.util.FloatProperty;
@@ -29,10 +28,10 @@ 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.PendingAnimation;

import com.android.launcher3.anim.PropertySetter;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.quickstep.views.ClearAllButton;

import com.android.quickstep.views.LauncherRecentsView;

import com.android.quickstep.views.RecentsView;
@@ -61,25 +60,22 @@ public final class RecentsViewStateController extends 
    }



    @Override

    void setStateWithAnimationInternal(@NonNull final LauncherState toState,

            @NonNull AnimatorSetBuilder builder, @NonNull AnimationConfig config) {

        super.setStateWithAnimationInternal(toState, builder, config);

    void setStateWithAnimationInternal(@NonNull LauncherState toState,

            @NonNull StateAnimationConfig config, @NonNull PendingAnimation builder) {

        super.setStateWithAnimationInternal(toState, config, builder);



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

        if (toState.overviewUi) {

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

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

            builder.addOnFrameCallback(mRecentsView::loadVisibleTaskData);

            mRecentsView.updateEmptyMessage();

        } else {

            updateAnim.addListener(

            builder.getAnim().addListener(

                    AnimationSuccessListener.forRunnable(mRecentsView::resetTaskVisuals));

        }

        builder.play(updateAnim);



        PropertySetter propertySetter = config.getPropertySetter(builder);

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

        float fullscreenProgress = toState.getOverviewFullscreenProgress();

        propertySetter.setFloat(mRecentsView, FULLSCREEN_PROGRESS, fullscreenProgress, LINEAR);

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

        builder.setFloat(mRecentsView, FULLSCREEN_PROGRESS,

                toState.getOverviewFullscreenProgress(), LINEAR);

    }



    private void setAlphas(PropertySetter propertySetter, int visibleElements) {

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java

+9 −8
Original line number Diff line number Diff line
@@ -14,17 +14,18 @@ 
 * limitations under the License.

 */

package com.android.launcher3.uioverrides.states;

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

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

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



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

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

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

import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCRIM_FADE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;



import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.R;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.states.StateAnimationConfig;



public class OverviewPeekState extends OverviewState {

    public OverviewPeekState(int id) {
@@ -41,11 +42,11 @@ public class OverviewPeekState extends OverviewState { 


    @Override

    public void prepareForAtomicAnimation(Launcher launcher, LauncherState fromState,

            AnimatorSetBuilder builder) {

            StateAnimationConfig config) {

        if (this == OVERVIEW_PEEK && fromState == NORMAL) {

            builder.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);

            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);

            builder.setInterpolator(ANIM_OVERVIEW_SCRIM_FADE, FAST_OUT_SLOW_IN);

            config.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);

            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);

            config.setInterpolator(ANIM_OVERVIEW_SCRIM_FADE, FAST_OUT_SLOW_IN);

        }

    }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java

+17 −17
Original line number Diff line number Diff line
@@ -18,13 +18,6 @@ package com.android.launcher3.uioverrides.states; 
import static android.view.View.VISIBLE;



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

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

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

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

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

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

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

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

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

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

import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
@@ -32,6 +25,13 @@ import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7; 
import static com.android.launcher3.config.FeatureFlags.ENABLE_OVERVIEW_ACTIONS;

import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;

import static com.android.launcher3.states.RotationHelper.REQUEST_ROTATE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_FADE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SCALE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;

import static com.android.quickstep.SysUINavigationMode.removeShelfFromOverview;
@@ -48,8 +48,8 @@ import com.android.launcher3.LauncherState; 
import com.android.launcher3.R;

import com.android.launcher3.Workspace;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.compat.AccessibilityManagerCompat;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action;

import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;

import com.android.quickstep.SysUINavigationMode;
@@ -225,14 +225,14 @@ public class OverviewState extends LauncherState { 


    @Override

    public void prepareForAtomicAnimation(Launcher launcher, LauncherState fromState,

            AnimatorSetBuilder builder) {

            StateAnimationConfig config) {

        if ((fromState == NORMAL || fromState == HINT_STATE) && this == OVERVIEW) {

            if (SysUINavigationMode.getMode(launcher) == NO_BUTTON) {

                builder.setInterpolator(ANIM_WORKSPACE_SCALE,

                config.setInterpolator(ANIM_WORKSPACE_SCALE,

                        fromState == NORMAL ? ACCEL : OVERSHOOT_1_2);

                builder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);

                config.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);

            } else {

                builder.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);

                config.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);



                // Scale up the recents, if it is not coming from the side

                RecentsView overview = launcher.getOverviewPanel();
@@ -240,15 +240,15 @@ public class OverviewState extends LauncherState { 
                    SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);

                }

            }

            builder.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);

            builder.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);

            config.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);

            config.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);

            Interpolator translationInterpolator = ENABLE_OVERVIEW_ACTIONS.get()

                    && removeShelfFromOverview(launcher)

                    ? OVERSHOOT_1_2

                    : OVERSHOOT_1_7;

            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, translationInterpolator);

            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, translationInterpolator);

            builder.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);

            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, translationInterpolator);

            config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, translationInterpolator);

            config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);

        }

    }

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

+25 −19
Original line number Diff line number Diff line
@@ -21,16 +21,16 @@ 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.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;

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

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

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

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

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

import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_FADE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_APPS_HEADER_FADE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_SCALE;

import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;

import static com.android.launcher3.states.StateAnimationConfig.PLAY_ATOMIC_OVERVIEW_PEEK;

import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;

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

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -44,10 +44,10 @@ 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;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;

import com.android.launcher3.util.VibratorWrapper;

import com.android.quickstep.SystemUiProxy;
@@ -105,8 +105,12 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
        LauncherState fromState = isPaused ? NORMAL : OVERVIEW_PEEK;

        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(), PLAY_ATOMIC_OVERVIEW_PEEK, peekDuration);



        StateAnimationConfig config = new StateAnimationConfig();

        config.duration = peekDuration;

        config.animFlags = PLAY_ATOMIC_OVERVIEW_PEEK;

        mPeekAnim = mLauncher.getStateManager().createAtomicAnimation(

                fromState, toState, config);

        mPeekAnim.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {
@@ -130,10 +134,10 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
    }



    @Override

    protected AnimatorSetBuilder getAnimatorSetBuilderForStates(LauncherState fromState,

            LauncherState toState) {

    protected StateAnimationConfig getConfigForStates(

            LauncherState fromState, LauncherState toState) {

        if (fromState == NORMAL && toState == ALL_APPS) {

            AnimatorSetBuilder builder = new AnimatorSetBuilder();

            StateAnimationConfig builder = new StateAnimationConfig();

            // Fade in prediction icons quickly, then rest of all apps after reaching overview.

            float progressToReachOverview = NORMAL.getVerticalProgress(mLauncher)

                    - OVERVIEW.getVerticalProgress(mLauncher);
@@ -152,7 +156,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
            builder.setInterpolator(ANIM_WORKSPACE_FADE, DEACCEL_3);

            return builder;

        } else if (fromState == ALL_APPS && toState == NORMAL) {

            AnimatorSetBuilder builder = new AnimatorSetBuilder();

            StateAnimationConfig builder = new StateAnimationConfig();

            // Keep all apps/predictions opaque until the very end of the transition.

            float progressToReachOverview = OVERVIEW.getVerticalProgress(mLauncher);

            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(
@@ -165,7 +169,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
                    1));

            return builder;

        }

        return super.getAnimatorSetBuilderForStates(fromState, toState);

        return super.getConfigForStates(fromState, toState);

    }



    @Override
@@ -211,9 +215,11 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
            public void onAnimationEnd(Animator animation) {

                super.onAnimationEnd(animation);

                if (mCancelled) {

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

                            mToState, new AnimatorSetBuilder(), PLAY_ATOMIC_OVERVIEW_PEEK,

                            PEEK_OUT_ANIM_DURATION);

                    StateAnimationConfig config = new StateAnimationConfig();

                    config.animFlags = PLAY_ATOMIC_OVERVIEW_PEEK;

                    config.duration = PEEK_OUT_ANIM_DURATION;

                    mPeekAnim = mLauncher.getStateManager().createAtomicAnimation(

                            mFromState, mToState, config);

                    mPeekAnim.start();

                }

                mAtomicAnim = null;