Internal change

PiperOrigin-RevId: 412135443

catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoFragment.java

@@ -20,7 +20,6 @@
 
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -32,6 +31,7 @@
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.constraintlayout.widget.ReactiveGuide;
+import androidx.core.view.ViewCompat;
 
 /** A Fragment that hosts a feed demo. */
 public class AdaptiveFeedDemoFragment extends Fragment {

catalog/java/io/material/catalog/adaptive/AdaptiveHeroDemoFragment.java

@@ -20,7 +20,6 @@
 
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -30,6 +29,7 @@
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.core.view.ViewCompat;
 
 /** A Fragment that hosts a hero demo. */
 public class AdaptiveHeroDemoFragment extends Fragment {

catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoFragment.java

@@ -22,7 +22,6 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -33,6 +32,7 @@
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.card.MaterialCardView;
 import com.google.android.material.transition.MaterialContainerTransform;
 import io.material.catalog.adaptive.AdaptiveListViewDemoFragment.EmailAdapter.EmailAdapterListener;

catalog/java/io/material/catalog/adaptive/AdaptiveListViewDetailDemoFragment.java

@@ -20,13 +20,13 @@
 
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
-import androidx.core.view.ViewCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import io.material.catalog.adaptive.AdaptiveListViewDemoFragment.EmailData;
 import io.material.catalog.adaptive.AdaptiveListViewDemoFragment.EmailData.Email;
 

catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java

@@ -22,12 +22,12 @@
 import android.os.Handler;
 import android.os.Looper;
 import androidx.core.util.Consumer;
-import androidx.core.view.ViewCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
 import androidx.window.layout.DisplayFeature;
 import androidx.window.layout.FoldingFeature;

catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoFragment.java

@@ -20,7 +20,6 @@
 
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -31,6 +30,7 @@
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.constraintlayout.widget.ReactiveGuide;
+import androidx.core.view.ViewCompat;
 
 /** A Fragment that hosts a supporting panel demo. */
 public class AdaptiveSupportingPanelDemoFragment extends Fragment {

catalog/java/io/material/catalog/bottomnav/BottomNavigationAnimatedDemoFragment.java

@@ -19,14 +19,14 @@
 import io.material.catalog.R;
 
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams;
+import androidx.core.view.ViewCompat;
 import io.material.catalog.feature.DemoFragment;
 
 /**

catalog/java/io/material/catalog/bottomsheet/BottomSheetMainDemoFragment.java

@@ -20,8 +20,6 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -34,6 +32,8 @@
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback;
 import com.google.android.material.bottomsheet.BottomSheetDialog;

catalog/java/io/material/catalog/card/CardListDemoFragment.java

@@ -19,9 +19,6 @@
 import io.material.catalog.R;
 
 import android.os.Bundle;
-import androidx.core.view.AccessibilityDelegateCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
@@ -34,6 +31,9 @@
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
 import com.google.android.material.card.MaterialCardView;
 import io.material.catalog.feature.DemoFragment;
 import java.util.Locale;

catalog/java/io/material/catalog/elevation/ElevationAnimationDemoFragment.java

@@ -20,12 +20,12 @@
 
 import android.animation.ValueAnimator;
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import io.material.catalog.feature.DemoFragment;
 

catalog/java/io/material/catalog/elevation/ElevationOverlayDemoActivity.java

@@ -19,7 +19,6 @@
 import io.material.catalog.R;
 
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -28,6 +27,7 @@
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.elevation.ElevationOverlayProvider;
 import com.google.android.material.internal.ViewUtils;
 import io.material.catalog.feature.DemoActivity;

catalog/java/io/material/catalog/fab/FabMainDemoFragment.java

@@ -19,14 +19,14 @@
 import io.material.catalog.R;
 
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.Button;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import io.material.catalog.feature.DemoFragment;

catalog/java/io/material/catalog/feature/BottomWindowInsetView.java

@@ -18,11 +18,11 @@
 
 
 import android.content.Context;
-import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 
 /**
  * A View that measures itself to be as tall as the bottom window inset.

catalog/java/io/material/catalog/feature/DemoFragment.java

@@ -24,7 +24,6 @@
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
-import androidx.core.view.ViewCompat;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -38,6 +37,7 @@
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.view.ViewCompat;
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
 import dagger.android.HasAndroidInjector;

catalog/java/io/material/catalog/feature/DemoLandingFragment.java

@@ -28,9 +28,6 @@
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
-import androidx.core.view.MarginLayoutParamsCompat;
-import androidx.core.view.MenuItemCompat;
-import androidx.core.view.ViewCompat;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
@@ -46,6 +43,9 @@
 import androidx.annotation.DimenRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.view.MarginLayoutParamsCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.transition.platform.MaterialContainerTransformSharedElementCallback;
 import dagger.android.support.DaggerFragment;
 import java.util.Collections;

catalog/java/io/material/catalog/feature/DemoUtils.java

@@ -18,13 +18,13 @@
 
 import android.app.Activity;
 import android.content.Context;
-import androidx.core.view.ViewCompat;
 import androidx.core.widget.NestedScrollView;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnLayoutChangeListener;
 import android.view.ViewGroup;
 import android.widget.ScrollView;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.internal.ContextUtils;
 import com.google.android.material.snackbar.Snackbar;
 import java.util.ArrayList;

catalog/java/io/material/catalog/font/FontMainDemoFragment.java

@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
 import androidx.core.widget.TextViewCompat;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -38,6 +37,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.resources.TextAppearance;
 import com.google.android.material.snackbar.Snackbar;
 import io.material.catalog.feature.DemoFragment;

catalog/java/io/material/catalog/musicplayer/AlbumsAdapter.java

@@ -18,7 +18,6 @@
 
 import io.material.catalog.R;
 
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -28,6 +27,7 @@
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import io.material.catalog.musicplayer.AlbumsAdapter.AlbumViewHolder;
 import io.material.catalog.musicplayer.MusicData.Album;
 

catalog/java/io/material/catalog/musicplayer/MusicPlayerAlbumDemoFragment.java

@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -33,6 +32,7 @@
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import androidx.transition.TransitionManager;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;

catalog/java/io/material/catalog/musicplayer/MusicPlayerLibraryDemoFragment.java

@@ -22,7 +22,6 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import androidx.fragment.app.Fragment;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -38,6 +37,7 @@
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import androidx.transition.Transition;
 import androidx.transition.TransitionManager;
 import com.google.android.material.transition.Hold;

catalog/java/io/material/catalog/preferences/CatalogPreferencesDialogFragment.java

@@ -20,7 +20,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
 import android.util.SparseIntArray;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -29,6 +28,7 @@
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.button.MaterialButtonToggleGroup;

catalog/java/io/material/catalog/tableofcontents/GridDividerDecoration.java

@@ -20,13 +20,13 @@
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
 import android.graphics.Rect;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.RecyclerView.ItemDecoration;
 import android.view.View;
 import androidx.annotation.ColorInt;
 import androidx.annotation.Px;
+import androidx.core.view.ViewCompat;
 
 /**
  * An {@link ItemDecoration} that adds Material-style dividers between grid items. This is meant to

catalog/java/io/material/catalog/tableofcontents/TocFragment.java

@@ -22,7 +22,6 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
-import androidx.core.view.ViewCompat;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -35,6 +34,7 @@
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.core.math.MathUtils;
+import androidx.core.view.ViewCompat;
 import com.google.android.material.appbar.AppBarLayout;
 import dagger.android.support.DaggerFragment;
 import io.material.catalog.feature.FeatureDemo;

catalog/java/io/material/catalog/tableofcontents/TocViewHolder.java

@@ -19,13 +19,13 @@
 import io.material.catalog.R;
 
 import androidx.fragment.app.FragmentActivity;
-import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.core.view.ViewCompat;
 import io.material.catalog.feature.FeatureDemo;
 import io.material.catalog.feature.FeatureDemoUtils;
 

catalog/java/io/material/catalog/tabs/TabsControllableDemoFragment.java

@@ -20,7 +20,6 @@
 
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
 import androidx.appcompat.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -36,6 +35,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.badge.BadgeDrawable;
 import com.google.android.material.tabs.TabLayout;