[TabLayout] Update motion attributes for tab layout

PiperOrigin-RevId: 468736364
material-components · Aug 22, 2022 · d1c5a52 · d1c5a52
1 parent 44cc9b7
commit d1c5a52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/java/com/google/android/material/tabs/TabLayout.java b/lib/java/com/google/android/material/tabs/TabLayout.java
@@ -25,6 +25,7 @@
 import static com.google.android.material.animation.AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR;
 import static com.google.android.material.theme.overlay.MaterialThemeOverlay.wrap;
 
+import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -94,6 +95,7 @@
 import com.google.android.material.drawable.DrawableUtils;
 import com.google.android.material.internal.ThemeEnforcement;
 import com.google.android.material.internal.ViewUtils;
+import com.google.android.material.motion.MotionUtils;
 import com.google.android.material.resources.MaterialResources;
 import com.google.android.material.ripple.RippleUtils;
 import com.google.android.material.shape.MaterialShapeDrawable;
@@ -480,6 +482,7 @@ public interface BaseOnTabSelectedListener<T extends Tab> {
   boolean unboundedRipple;
 
   private TabIndicatorInterpolator tabIndicatorInterpolator;
+  private final TimeInterpolator tabIndicatorTimeInterpolator;
 
   @Nullable private BaseOnTabSelectedListener selectedListener;
 
@@ -607,6 +610,9 @@ public TabLayout(@NonNull Context context, @Nullable AttributeSet attrs, int def
 
     tabIndicatorAnimationDuration =
         a.getInt(R.styleable.TabLayout_tabIndicatorAnimationDuration, ANIMATION_DURATION);
+    tabIndicatorTimeInterpolator =
+        MotionUtils.resolveThemeInterpolator(
+            context, R.attr.motionEasingEmphasizedInterpolator, FAST_OUT_SLOW_IN_INTERPOLATOR);
 
     requestedTabMinWidth =
         a.getDimensionPixelSize(R.styleable.TabLayout_tabMinWidth, INVALID_WIDTH);
@@ -1818,7 +1824,7 @@ private void animateToTab(int newPosition) {
   private void ensureScrollAnimator() {
     if (scrollAnimator == null) {
       scrollAnimator = new ValueAnimator();
-      scrollAnimator.setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR);
+      scrollAnimator.setInterpolator(tabIndicatorTimeInterpolator);
       scrollAnimator.setDuration(tabIndicatorAnimationDuration);
       scrollAnimator.addUpdateListener(
           new ValueAnimator.AnimatorUpdateListener() {
@@ -3238,7 +3244,7 @@ public void onAnimationUpdate(@NonNull ValueAnimator valueAnimator) {
       if (recreateAnimation) {
         // Create & start a new indicatorAnimator.
         ValueAnimator animator = indicatorAnimator = new ValueAnimator();
-        animator.setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR);
+        animator.setInterpolator(tabIndicatorTimeInterpolator);
         animator.setDuration(duration);
         animator.setFloatValues(0F, 1F);
         animator.addUpdateListener(updateListener);

diff --git a/lib/java/com/google/android/material/tabs/res/values/styles.xml b/lib/java/com/google/android/material/tabs/res/values/styles.xml
@@ -79,6 +79,7 @@
     <item name="tabIndicatorColor">?attr/colorPrimary</item>
     <item name="tabRippleColor">@color/m3_tabs_ripple_color</item>
     <item name="tabIndicatorFullWidth">false</item>
+    <item name="tabIndicatorAnimationDuration">?attr/motionDurationLong2</item>
   </style>
 
   <style name="Widget.Material3.TabLayout" parent="Base.Widget.Material3.TabLayout"/>