[TabLayout] Fixing bug with animation flicker when using tabs with Vi…

…ewPager2

PiperOrigin-RevId: 491460655
(cherry picked from commit 84b7bc3)

lib/java/com/google/android/material/tabs/TabLayout.java

@@ -503,6 +503,7 @@ public interface BaseOnTabSelectedListener<T extends Tab> {
   private TabLayoutOnPageChangeListener pageChangeListener;
   private AdapterChangeListener adapterChangeListener;
   private boolean setupViewPagerImplicitly;
+  private int viewPagerScrollState;
 
   // Pool we use as a simple RecyclerBin
   private final Pools.Pool<TabView> tabViewPool = new Pools.SimplePool<>(12);
@@ -1566,6 +1567,10 @@ public void setTabsFromPagerAdapter(@Nullable final PagerAdapter adapter) {
     setPagerAdapter(adapter, false);
   }
 
+  void updateViewPagerScrollState(int scrollState) {
+    this.viewPagerScrollState = scrollState;
+  }
+
   @Override
   public boolean shouldDelayChildPressedState() {
     // Only delay the pressed state if the tabs can scroll
@@ -3240,7 +3245,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
     /** Immediately update the indicator position to the currently selected position. */
     private void jumpIndicatorToSelectedPosition() {
       // Don't update the indicator position if the scroll state is not idle.
-      if (pageChangeListener != null && pageChangeListener.scrollState != SCROLL_STATE_IDLE) {
+      if (viewPagerScrollState != SCROLL_STATE_IDLE) {
         return;
       }
       final View currentView = getChildAt(getSelectedTabPosition());
@@ -3467,6 +3472,10 @@ public TabLayoutOnPageChangeListener(TabLayout tabLayout) {
     public void onPageScrollStateChanged(final int state) {
       previousScrollState = scrollState;
       scrollState = state;
+      TabLayout tabLayout = tabLayoutRef.get();
+      if (tabLayout != null) {
+        tabLayout.updateViewPagerScrollState(scrollState);
+      }
     }
 
     @Override

lib/java/com/google/android/material/tabs/TabLayoutMediator.java

@@ -210,6 +210,10 @@ private static class TabLayoutOnPageChangeCallback extends ViewPager2.OnPageChan
     public void onPageScrollStateChanged(final int state) {
       previousScrollState = scrollState;
       scrollState = state;
+      TabLayout tabLayout = tabLayoutRef.get();
+      if (tabLayout != null) {
+        tabLayout.updateViewPagerScrollState(scrollState);
+      }
     }
 
     @Override