From 5023771e05f0a64177dfeb2a545394ed4c63e9d1 Mon Sep 17 00:00:00 2001 From: Jonathan Miranda Date: Tue, 26 Jun 2018 20:21:07 +0000 Subject: Revert "Tune app closing/launcher resume animation "spring" values." This reverts commit c9a7c50fac2552b96c4f80587494afcb0da78aab. Reason for revert: Change-Id: I7ed4270b742803265ed4e3e13b63688842e0b48c --- src/com/android/launcher3/anim/Interpolators.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/com/android') diff --git a/src/com/android/launcher3/anim/Interpolators.java b/src/com/android/launcher3/anim/Interpolators.java index 389da4807..8a1abf412 100644 --- a/src/com/android/launcher3/anim/Interpolators.java +++ b/src/com/android/launcher3/anim/Interpolators.java @@ -119,20 +119,18 @@ public class Interpolators { public static final Interpolator OSCILLATE = new Interpolator() { // Used to scale the oscillations horizontally - private final float horizontalScale = 4f; + private final float horizontalScale = 1f; // Used to shift the oscillations horizontally - private final float horizontalShift = 0.22f; + private final float horizontalShift = 0.5f; // 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(amplitude * Math.PI * t))) + return (float) ((verticalScale * (Math.exp(-t) * Math.cos(2 * Math.PI * t))) + verticalShift); } }; -- cgit v1.2.3