Commit c4b6c5a0 authored by Ben Joyce's avatar Ben Joyce Committed by Commit Bot

Updates interpolator to use AndroidX references.

Custom_tabs still needs old references.

Bug: 1052460
Change-Id: Id79b88e6e924de6d92e0e38284f687082afc7894
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2086268
Commit-Queue: benjamin joyce <bjoyce@google.com>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746895}
parent acd1f6fc
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
package org.chromium.chrome.browser.feed.library.basicstream.internal; package org.chromium.chrome.browser.feed.library.basicstream.internal;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.support.v4.view.animation.FastOutLinearInInterpolator;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.RecyclerView.ViewHolder; import android.support.v7.widget.RecyclerView.ViewHolder;
import android.support.v7.widget.helper.ItemTouchHelper; import android.support.v7.widget.helper.ItemTouchHelper;
import android.view.animation.Interpolator; import android.view.animation.Interpolator;
import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
import org.chromium.chrome.browser.feed.library.basicstream.internal.viewholders.SwipeableViewHolder; import org.chromium.chrome.browser.feed.library.basicstream.internal.viewholders.SwipeableViewHolder;
/** {@link ItemTouchHelper.Callback} to allow dismissing cards via swiping. */ /** {@link ItemTouchHelper.Callback} to allow dismissing cards via swiping. */
......
...@@ -9,11 +9,12 @@ import android.animation.AnimatorListenerAdapter; ...@@ -9,11 +9,12 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.content.res.Resources; import android.content.res.Resources;
import android.support.v4.view.animation.FastOutLinearInInterpolator;
import android.support.v4.view.animation.LinearOutSlowInInterpolator;
import android.view.View; import android.view.View;
import android.view.ViewGroup.MarginLayoutParams; import android.view.ViewGroup.MarginLayoutParams;
import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver;
import org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator; import org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator;
......
...@@ -4,13 +4,14 @@ ...@@ -4,13 +4,14 @@
package org.chromium.components.browser_ui.widget.animation; package org.chromium.components.browser_ui.widget.animation;
import android.support.v4.view.animation.FastOutLinearInInterpolator;
import android.support.v4.view.animation.FastOutSlowInInterpolator;
import android.support.v4.view.animation.LinearOutSlowInInterpolator;
import android.view.animation.AccelerateInterpolator; import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
import android.view.animation.LinearInterpolator; import android.view.animation.LinearInterpolator;
import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
/** Reference to one of each standard interpolator to avoid allocations. */ /** Reference to one of each standard interpolator to avoid allocations. */
public class Interpolators { public class Interpolators {
public static final AccelerateInterpolator ACCELERATE_INTERPOLATOR = public static final AccelerateInterpolator ACCELERATE_INTERPOLATOR =
......
...@@ -6,8 +6,9 @@ Security Critical: yes ...@@ -6,8 +6,9 @@ Security Critical: yes
Description: Description:
This is a modified copy of the swipe refresh layout widget (and its two This is a modified copy of the swipe refresh layout widget (and its two
dependencies) from Android's app compat library (v4). The widget provides a dependencies) from Android's app compat library (v4). This has been
pull-to-refresh styled layout for touch-activated refresh of view contents. migrated to use AndroidX libraries. The widget provides a pull-to-refresh
styled layout for touch-activated refresh of view contents.
Local Modifications: Local Modifications:
......
...@@ -16,11 +16,6 @@ ...@@ -16,11 +16,6 @@
package org.chromium.third_party.android.swiperefresh; package org.chromium.third_party.android.swiperefresh;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.Interpolator;
import android.view.animation.Animation;
import android.view.animation.LinearInterpolator;
import android.view.animation.Transformation;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Canvas; import android.graphics.Canvas;
...@@ -32,11 +27,17 @@ import android.graphics.Path; ...@@ -32,11 +27,17 @@ import android.graphics.Path;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Animatable; import android.graphics.drawable.Animatable;
import android.support.v4.view.animation.FastOutSlowInInterpolator; import android.graphics.drawable.Drawable;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.View; import android.view.View;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.Animation;
import android.view.animation.Interpolator;
import android.view.animation.LinearInterpolator;
import android.view.animation.Transformation;
import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
......
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
package org.chromium.ui.interpolators; package org.chromium.ui.interpolators;
import android.support.v4.view.animation.FastOutLinearInInterpolator;
import android.support.v4.view.animation.FastOutSlowInInterpolator;
import android.support.v4.view.animation.LinearOutSlowInInterpolator;
import android.view.animation.Interpolator; import android.view.animation.Interpolator;
import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
/** /**
* A pre-baked bezier-curved interpolator for quantum-paper transitions. * A pre-baked bezier-curved interpolator for quantum-paper transitions.
* TODO(dtrainor): Move to the API Compatibility version iff that supports the curves we need and * TODO(dtrainor): Move to the API Compatibility version iff that supports the curves we need and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment