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

Commit d34690bc authored by Tony Wickham's avatar Tony Wickham Committed by Automerger Merge Worker
Browse files

Merge "Restore old interpolators for Overview -> Home" into tm-qpr-dev am: b4af2072 

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



Change-Id: Ibab07d5c2dfeedc2c68d0e33a5334d87875e2804
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fdbc99b7 b4af2072

quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java

+9 −2
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import static com.android.launcher3.anim.Interpolators.DEACCEL_1_7; 
import static com.android.launcher3.anim.Interpolators.DEACCEL_3;

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

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

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

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

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

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

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

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

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

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

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

import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -103,7 +104,10 @@ public class QuickstepAtomicAnimationFactory extends 
            }

            }





            config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(LINEAR, 0, 0.25f));

            config.setInterpolator(ANIM_OVERVIEW_ACTIONS_FADE, clampToProgress(LINEAR, 0, 0.25f));

            config.setInterpolator(ANIM_SCRIM_FADE, clampToProgress(LINEAR, 0.33f, 1));

            config.setInterpolator(ANIM_SCRIM_FADE,

                    fromState == OVERVIEW_SPLIT_SELECT

                            ? clampToProgress(LINEAR, 0.33f, 1)

                            : LINEAR);

            config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);

            config.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL);

            config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);

            config.setInterpolator(ANIM_WORKSPACE_FADE, ACCEL);
@@ -112,7 +116,10 @@ public class QuickstepAtomicAnimationFactory extends 
                // Overview is going offscreen, so keep it at its current scale and opacity.

                // Overview is going offscreen, so keep it at its current scale and opacity.

                config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);

                config.setInterpolator(ANIM_OVERVIEW_SCALE, FINAL_FRAME);

                config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);

                config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);

                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, EMPHASIZED_DECELERATE);

                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X,

                        fromState == OVERVIEW_SPLIT_SELECT

                                ? EMPHASIZED_DECELERATE

                                : clampToProgress(FAST_OUT_SLOW_IN, 0, 0.75f));

                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);

                config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);





                // Scroll RecentsView to page 0 as it goes offscreen, if necessary.

                // Scroll RecentsView to page 0 as it goes offscreen, if necessary.