From c9a7c50fac2552b96c4f80587494afcb0da78aab Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Mon, 25 Jun 2018 16:42:58 -0700 Subject: Tune app closing/launcher resume animation "spring" values. Bug: 109828964 Change-Id: I64252667451f511b7affdde5ffb28812876e7f4c --- src/com/android/launcher3/anim/Interpolators.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/com/android/launcher3') diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java index 8a1abf412..389da4807 100644 --- a/src/com/android/launcher3/anim/Interpolators.java +++ b/src/com/android/launcher3/anim/Interpolators.java @@ -119,18 +119,20 @@ public class Interpolators { public static final Interpolator OSCILLATE = new Interpolator() { // Used to scale the oscillations horizontally - private final float horizontalScale = 1f; + private final float horizontalScale = 4f; // Used to shift the oscillations horizontally - private final float horizontalShift = 0.5f; + private final float horizontalShift = 0.22f; // Used to scale the oscillations vertically private final float verticalScale = 1f; // Used to shift the oscillations vertically private final float verticalShift = 1f; + // Amplitude of oscillation + private final float amplitude = 0.9f; @Override public float getInterpolation(float t) { t = horizontalScale * (t + horizontalShift); - return (float) ((verticalScale * (Math.exp(-t) * Math.cos(2 * Math.PI * t))) + return (float) ((verticalScale * (Math.exp(-t) * Math.cos(amplitude * Math.PI * t))) + verticalShift); } }; -- cgit v1.2.3