Delete unused interpolators+share interpolators with CompositorAnimator

CL is deleting unused interpolators in Stack.java and moving more interpolators for sharing into CompositorAnimator.java

Change-Id: I081039763d64d618809ad7066eb83c2021220e90
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1594725Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
Cr-Commit-Position: refs/heads/master@{#659224}

chrome/android/java/src/org/chromium/chrome/browser/compositor/animation/CompositorAnimator.java

@@ -9,6 +9,7 @@ import android.animation.TimeInterpolator;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LinearInterpolator;
@@ -96,6 +97,8 @@ public class CompositorAnimator extends Animator {
             new AccelerateInterpolator();
     public static final DecelerateInterpolator DECELERATE_INTERPOLATOR =
             new DecelerateInterpolator();
+    public static final FastOutSlowInInterpolator FAST_OUT_SLOW_IN_INTERPOLATOR =
+            new FastOutSlowInInterpolator();
     public static final LinearInterpolator LINEAR_INTERPOLATOR = new LinearInterpolator();
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchCaptionControl.java

@@ -5,10 +5,8 @@
 package org.chromium.chrome.browser.compositor.bottombar.contextualsearch;
 
 import android.content.Context;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Interpolator;
 import android.widget.TextView;
 
 import org.chromium.chrome.R;
@@ -25,7 +23,6 @@ import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
 public class ContextualSearchCaptionControl extends OverlayPanelTextViewInflater {
     private static final float ANIMATION_PERCENTAGE_ZERO = 0.f;
     private static final float ANIMATION_PERCENTAGE_COMPLETE = 1.f;
-    private static final Interpolator ANIMATION_INTERPOLATOR = new FastOutSlowInInterpolator();
 
     /**
      * The caption View.
@@ -195,7 +192,8 @@ public class ContextualSearchCaptionControl extends OverlayPanelTextViewInflater
                 OverlayPanelAnimation.BASE_ANIMATION_DURATION_MS, null);
         mTransitionAnimator.addUpdateListener(
                 animator -> mAnimationPercentage = animator.getAnimatedValue());
-        mTransitionAnimator.setInterpolator(ANIMATION_INTERPOLATOR);
+        mTransitionAnimator.setInterpolator(CompositorAnimator.FAST_OUT_SLOW_IN_INTERPOLATOR);
+
         mTransitionAnimator.start();
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java

@@ -7,8 +7,6 @@ package org.chromium.chrome.browser.compositor.layouts;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.RectF;
-import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Interpolator;
 
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
@@ -67,8 +65,6 @@ public class ToolbarSwipeLayout extends Layout {
     private final BlackHoleEventFilter mBlackHoleEventFilter;
     private final TabListSceneLayer mSceneLayer;
 
-    private final Interpolator mEdgeInterpolator = new DecelerateInterpolator();
-
     /** The left and right scene layer responsible for drawing bottom toolbars for each tab. */
     private ScrollingBottomViewSceneLayer mLeftBottomToolbarSceneLayer;
     private ScrollingBottomViewSceneLayer mRightBottomToolbarSceneLayer;
@@ -284,7 +280,8 @@ public class ToolbarSwipeLayout extends Layout {
         if (doEdge) {
             float progress = mOffset / getWidth();
             float direction = Math.signum(progress);
-            float smoothedProgress = mEdgeInterpolator.getInterpolation(Math.abs(progress));
+            float smoothedProgress =
+                    CompositorAnimator.DECELERATE_INTERPOLATOR.getInterpolation(Math.abs(progress));
 
             float maxSlide = getWidth() / 5.f;
             rightX = direction * smoothedProgress * maxSlide;

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/Stack.java

@@ -12,8 +12,6 @@ import android.content.res.Resources;
 import android.graphics.RectF;
 import android.support.annotation.IntDef;
 import android.util.Pair;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.view.animation.Interpolator;
 
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
@@ -176,12 +174,6 @@ public abstract class Stack {
     protected float mMaxUnderScroll;
     protected float mMaxOverScrollAngle; // This will be updated from values.xml
     private float mMaxOverScrollSlide;
-    private final Interpolator mOverScrollAngleInterpolator =
-            new AccelerateDecelerateInterpolator();
-    private final Interpolator mUnderScrollAngleInterpolator =
-            CompositorAnimator.DECELERATE_INTERPOLATOR;
-    private final Interpolator mOverscrollSlideInterpolator =
-            new AccelerateDecelerateInterpolator();
 
     // Drag Lock
     private @DragLock int mDragLock = DragLock.NONE;

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/stack/StackViewAnimation.java

@@ -9,13 +9,13 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.content.res.Resources;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.FrameLayout;
 
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.compositor.animation.CompositorAnimator;
 import org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimation.OverviewAnimationType;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabThemeColorHelper;
@@ -87,19 +87,19 @@ public class StackViewAnimation {
         PropertyValuesHolder viewAlpha = PropertyValuesHolder.ofFloat(View.ALPHA, 0.f, 1.f);
         ObjectAnimator viewAlphaAnimator = ObjectAnimator.ofPropertyValuesHolder(view, viewAlpha);
         viewAlphaAnimator.setDuration(TAB_OPENED_VIEW_ANIMATION_DURATION);
-        viewAlphaAnimator.setInterpolator(new FastOutSlowInInterpolator());
+        viewAlphaAnimator.setInterpolator(CompositorAnimator.FAST_OUT_SLOW_IN_INTERPOLATOR);
 
         PropertyValuesHolder yTranslation =
                 PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, mTranslationYStart, 0.f);
         ObjectAnimator viewYTranslationAnimator =
                 ObjectAnimator.ofPropertyValuesHolder(view, yTranslation);
         viewYTranslationAnimator.setDuration(TAB_OPENED_VIEW_ANIMATION_DURATION);
-        viewYTranslationAnimator.setInterpolator(new FastOutSlowInInterpolator());
+        viewYTranslationAnimator.setInterpolator(CompositorAnimator.FAST_OUT_SLOW_IN_INTERPOLATOR);
 
         PropertyValuesHolder bgAlpha = PropertyValuesHolder.ofFloat(View.ALPHA, 0.f, 1.f);
         ObjectAnimator bgAlphaAnimator = ObjectAnimator.ofPropertyValuesHolder(bgView, bgAlpha);
         bgAlphaAnimator.setDuration(TAB_OPENED_BG_ANIMATION_DURATION);
-        bgAlphaAnimator.setInterpolator(new FastOutSlowInInterpolator());
+        bgAlphaAnimator.setInterpolator(CompositorAnimator.FAST_OUT_SLOW_IN_INTERPOLATOR);
 
         AnimatorSet set = new AnimatorSet();
         set.playTogether(viewAlphaAnimator, viewYTranslationAnimator, bgAlphaAnimator);