Added new interpolator spec to be used throughout all of our motion
We're moving to a new version of interpolators which should be used for all of our motion. The goal is to centralize all our interpolators to a single place, such that we can update them all at once if we so desire. Bug: 197074707 Test: existing animations still look great, new interpolators work Change-Id: I076535310bb1a4b0ff381067c6cf10cf285fbaa1
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.systemui.animation;
|
||||
|
||||
import android.graphics.Path;
|
||||
import android.util.MathUtils;
|
||||
import android.view.animation.AccelerateDecelerateInterpolator;
|
||||
import android.view.animation.AccelerateInterpolator;
|
||||
@@ -29,7 +30,97 @@ import android.view.animation.PathInterpolator;
|
||||
* Utility class to receive interpolators from
|
||||
*/
|
||||
public class Interpolators {
|
||||
public static final Interpolator FAST_OUT_SLOW_IN = new PathInterpolator(0.4f, 0f, 0.2f, 1f);
|
||||
|
||||
/*
|
||||
* ============================================================================================
|
||||
* Emphasized interpolators.
|
||||
* ============================================================================================
|
||||
*/
|
||||
|
||||
/**
|
||||
* The default emphasized interpolator. Used for hero / emphasized movement of content.
|
||||
*/
|
||||
public static final Interpolator EMPHASIZED = createEmphasizedInterpolator();
|
||||
|
||||
/**
|
||||
* The accelerated emphasized interpolator. Used for hero / emphasized movement of content that
|
||||
* is disappearing e.g. when moving off screen.
|
||||
*/
|
||||
public static final Interpolator EMPHASIZED_ACCELERATE = new PathInterpolator(
|
||||
0.3f, 0f, 0.8f, 0.15f);
|
||||
|
||||
/**
|
||||
* The decelerating emphasized interpolator. Used for hero / emphasized movement of content that
|
||||
* is appearing e.g. when coming from off screen
|
||||
*/
|
||||
public static final Interpolator EMPHASIZED_DECELERATE = new PathInterpolator(
|
||||
0.05f, 0.7f, 0.1f, 1f);
|
||||
|
||||
|
||||
/*
|
||||
* ============================================================================================
|
||||
* Standard interpolators.
|
||||
* ============================================================================================
|
||||
*/
|
||||
|
||||
/**
|
||||
* The standard interpolator that should be used on every normal animation
|
||||
*/
|
||||
public static final Interpolator STANDARD = new PathInterpolator(
|
||||
0.2f, 0f, 0f, 1f);
|
||||
|
||||
/**
|
||||
* The standard accelerating interpolator that should be used on every regular movement of
|
||||
* content that is disappearing e.g. when moving off screen.
|
||||
*/
|
||||
public static final Interpolator STANDARD_ACCELERATE = new PathInterpolator(
|
||||
0.3f, 0f, 1f, 1f);
|
||||
|
||||
/**
|
||||
* The standard decelerating interpolator that should be used on every regular movement of
|
||||
* content that is appearing e.g. when coming from off screen.
|
||||
*/
|
||||
public static final Interpolator STANDARD_DECELERATE = new PathInterpolator(
|
||||
0f, 0f, 0f, 1f);
|
||||
|
||||
/*
|
||||
* ============================================================================================
|
||||
* Legacy
|
||||
* ============================================================================================
|
||||
*/
|
||||
|
||||
/**
|
||||
* The default legacy interpolator as defined in Material 1. Also known as FAST_OUT_SLOW_IN.
|
||||
*/
|
||||
public static final Interpolator LEGACY = new PathInterpolator(0.4f, 0f, 0.2f, 1f);
|
||||
|
||||
/**
|
||||
* The default legacy accelerating interpolator as defined in Material 1.
|
||||
* Also known as FAST_OUT_LINEAR_IN.
|
||||
*/
|
||||
public static final Interpolator LEGACY_ACCELERATE = new PathInterpolator(0.4f, 0f, 1f, 1f);
|
||||
|
||||
/**
|
||||
* The default legacy decelerating interpolator as defined in Material 1.
|
||||
* Also known as LINEAR_OUT_SLOW_IN.
|
||||
*/
|
||||
public static final Interpolator LEGACY_DECELERATE = new PathInterpolator(0f, 0f, 0.2f, 1f);
|
||||
|
||||
/**
|
||||
* Linear interpolator. Often used if the interpolator is for different properties who need
|
||||
* different interpolations.
|
||||
*/
|
||||
public static final Interpolator LINEAR = new LinearInterpolator();
|
||||
|
||||
/*
|
||||
* ============================================================================================
|
||||
* Custom interpolators
|
||||
* ============================================================================================
|
||||
*/
|
||||
|
||||
public static final Interpolator FAST_OUT_SLOW_IN = LEGACY;
|
||||
public static final Interpolator FAST_OUT_LINEAR_IN = LEGACY_ACCELERATE;
|
||||
public static final Interpolator LINEAR_OUT_SLOW_IN = LEGACY_DECELERATE;
|
||||
|
||||
/**
|
||||
* Like {@link #FAST_OUT_SLOW_IN}, but used in case the animation is played in reverse (i.e. t
|
||||
@@ -37,12 +128,9 @@ public class Interpolators {
|
||||
*/
|
||||
public static final Interpolator FAST_OUT_SLOW_IN_REVERSE =
|
||||
new PathInterpolator(0.8f, 0f, 0.6f, 1f);
|
||||
public static final Interpolator FAST_OUT_LINEAR_IN = new PathInterpolator(0.4f, 0f, 1f, 1f);
|
||||
public static final Interpolator LINEAR_OUT_SLOW_IN = new PathInterpolator(0f, 0f, 0.2f, 1f);
|
||||
public static final Interpolator SLOW_OUT_LINEAR_IN = new PathInterpolator(0.8f, 0f, 1f, 1f);
|
||||
public static final Interpolator ALPHA_IN = new PathInterpolator(0.4f, 0f, 1f, 1f);
|
||||
public static final Interpolator ALPHA_OUT = new PathInterpolator(0f, 0f, 0.8f, 1f);
|
||||
public static final Interpolator LINEAR = new LinearInterpolator();
|
||||
public static final Interpolator ACCELERATE = new AccelerateInterpolator();
|
||||
public static final Interpolator ACCELERATE_DECELERATE = new AccelerateDecelerateInterpolator();
|
||||
public static final Interpolator DECELERATE_QUINT = new DecelerateInterpolator(2.5f);
|
||||
@@ -72,6 +160,12 @@ public class Interpolators {
|
||||
public static final Interpolator TOUCH_RESPONSE_REVERSE =
|
||||
new PathInterpolator(0.9f, 0f, 0.7f, 1f);
|
||||
|
||||
/*
|
||||
* ============================================================================================
|
||||
* Functions / Utilities
|
||||
* ============================================================================================
|
||||
*/
|
||||
|
||||
/**
|
||||
* Calculate the amount of overshoot using an exponential falloff function with desired
|
||||
* properties, where the overshoot smoothly transitions at the 1.0f boundary into the
|
||||
@@ -122,4 +216,14 @@ public class Interpolators {
|
||||
return (float) (1f - 0.5f * (1f - Math.cos(3.14159f * oneMinusFrac * oneMinusFrac)));
|
||||
}
|
||||
}
|
||||
|
||||
// Create the default emphasized interpolator
|
||||
private static PathInterpolator createEmphasizedInterpolator() {
|
||||
Path path = new Path();
|
||||
// Doing the same as fast_out_extra_slow_in
|
||||
path.moveTo(0f, 0f);
|
||||
path.cubicTo(0.05f, 0f, 0.133333f, 0.06f, 0.166666f, 0.4f);
|
||||
path.cubicTo(0.208333f, 0.82f, 0.25f, 1f, 1f, 1f);
|
||||
return new PathInterpolator(path);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user