From cfc00aa5a361f3c1c8a784fa597f03266af22e6e Mon Sep 17 00:00:00 2001 From: Material Design Team Date: Tue, 7 Dec 2021 23:25:06 +0000 Subject: [PATCH] Update android core class definitions across material PiperOrigin-RevId: 414839941 --- .../material/catalog/adaptive/AdaptiveFeedDemoActivity.java | 2 +- .../catalog/adaptive/AdaptiveListViewDemoActivity.java | 2 +- .../adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java | 2 +- .../adaptive/AdaptiveSupportingPanelDemoActivity.java | 2 +- .../catalog/datepicker/DatePickerMainDemoFragment.java | 2 +- catalog/java/io/material/catalog/feature/DemoUtils.java | 2 +- .../java/io/material/catalog/font/FontMainDemoFragment.java | 2 +- .../catalog/windowpreferences/WindowPreferencesManager.java | 2 +- .../com/google/android/material/appbar/AppBarLayout.java | 4 ++-- .../android/material/appbar/CollapsingToolbarLayout.java | 4 ++-- .../com/google/android/material/appbar/MaterialToolbar.java | 2 +- .../google/android/material/bottomappbar/BottomAppBar.java | 2 +- .../android/material/bottomsheet/BottomSheetBehavior.java | 2 +- .../com/google/android/material/button/MaterialButton.java | 4 ++-- .../android/material/button/MaterialButtonHelper.java | 2 +- .../android/material/card/MaterialCardViewHelper.java | 2 +- .../google/android/material/checkbox/MaterialCheckBox.java | 2 +- lib/java/com/google/android/material/chip/ChipDrawable.java | 6 +++--- .../com/google/android/material/color/MaterialColors.java | 2 +- .../android/material/datepicker/CalendarConstraints.java | 2 +- .../android/material/datepicker/CalendarItemStyle.java | 2 +- .../google/android/material/datepicker/DateSelector.java | 2 +- .../com/google/android/material/datepicker/DateStrings.java | 2 +- .../android/material/datepicker/MaterialCalendar.java | 2 +- .../material/datepicker/MaterialCalendarGridView.java | 2 +- .../android/material/datepicker/MaterialDatePicker.java | 2 +- .../android/material/datepicker/RangeDateSelector.java | 4 ++-- .../android/material/datepicker/SingleDateSelector.java | 2 +- .../material/divider/MaterialDividerItemDecoration.java | 2 +- .../material/elevation/ElevationOverlayProvider.java | 2 +- .../material/floatingactionbutton/BaseMotionStrategy.java | 2 +- .../material/floatingactionbutton/BorderDrawable.java | 2 +- .../material/floatingactionbutton/FloatingActionButton.java | 6 +++--- .../floatingactionbutton/FloatingActionButtonImpl.java | 4 ++-- .../android/material/internal/CollapsingTextHelper.java | 2 +- .../android/material/internal/NavigationMenuItemView.java | 6 +++--- .../android/material/internal/NavigationMenuPresenter.java | 2 +- .../com/google/android/material/motion/MotionUtils.java | 2 +- .../android/material/navigation/NavigationBarItemView.java | 4 ++-- .../android/material/navigation/NavigationBarMenuView.java | 2 +- .../android/material/navigation/NavigationBarView.java | 2 +- .../android/material/radiobutton/MaterialRadioButton.java | 2 +- .../android/material/resources/CancelableFontCallback.java | 2 +- .../google/android/material/resources/TextAppearance.java | 4 ++-- .../material/resources/TextAppearanceFontCallback.java | 2 +- .../android/material/ripple/RippleDrawableCompat.java | 2 +- .../com/google/android/material/ripple/RippleUtils.java | 2 +- .../com/google/android/material/shadow/ShadowRenderer.java | 2 +- .../android/material/shape/MaterialShapeDrawable.java | 4 ++-- lib/java/com/google/android/material/slider/BaseSlider.java | 2 +- .../android/material/snackbar/BaseTransientBottomBar.java | 2 +- lib/java/com/google/android/material/tabs/TabLayout.java | 6 +++--- .../android/material/textfield/IndicatorViewController.java | 2 +- .../google/android/material/textfield/TextInputLayout.java | 4 ++-- .../google/android/material/tooltip/TooltipDrawable.java | 2 +- .../material/transition/MaterialContainerTransform.java | 2 +- .../google/android/material/transition/TransitionUtils.java | 2 +- .../transition/platform/MaterialContainerTransform.java | 2 +- .../MaterialContainerTransformSharedElementCallback.java | 4 ++-- .../material/transition/platform/TransitionUtils.java | 2 +- .../google/android/material/badge/BadgeDrawableTest.java | 2 +- .../google/android/material/button/MaterialButtonTest.java | 2 +- .../android/material/checkbox/MaterialCheckBoxTest.java | 2 +- .../android/material/datepicker/RangeDateSelectorTest.java | 2 +- .../material/elevation/ElevationOverlayProviderTest.java | 2 +- .../material/radiobutton/MaterialRadioButtonTest.java | 2 +- .../material/bottomnavigation/BottomNavigationViewTest.java | 2 +- .../material/bottomsheet/BottomSheetBehaviorTest.java | 2 +- .../material/datepicker/MaterialDatePickerTestUtils.java | 2 +- .../android/material/navigation/NavigationViewTest.java | 2 +- .../google/android/material/testutils/TestUtilsActions.java | 2 +- .../android/material/testutils/TestUtilsMatchers.java | 2 +- .../material/textfield/TextInputLayoutIconsTest.java | 2 +- .../android/material/textfield/TextInputLayoutTest.java | 2 +- 74 files changed, 92 insertions(+), 92 deletions(-) diff --git a/catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoActivity.java b/catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoActivity.java index ce755013109..13f8374071b 100644 --- a/catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoActivity.java +++ b/catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoActivity.java @@ -22,12 +22,12 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import androidx.core.util.Consumer; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.util.Consumer; import androidx.drawerlayout.widget.DrawerLayout; import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter; import androidx.window.layout.DisplayFeature; diff --git a/catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoActivity.java b/catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoActivity.java index 9781c92dded..8cc90510181 100644 --- a/catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoActivity.java +++ b/catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoActivity.java @@ -23,7 +23,6 @@ import android.os.Handler; import android.os.Looper; import androidx.fragment.app.FragmentManager; -import androidx.core.util.Consumer; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -32,6 +31,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; import androidx.constraintlayout.widget.ReactiveGuide; +import androidx.core.util.Consumer; import androidx.drawerlayout.widget.DrawerLayout; import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter; import androidx.window.layout.DisplayFeature; diff --git a/catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java b/catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java index ab10eee6341..5956f0ccd43 100644 --- a/catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java +++ b/catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java @@ -21,12 +21,12 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import androidx.core.util.Consumer; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.util.Consumer; import androidx.core.view.ViewCompat; import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter; import androidx.window.layout.DisplayFeature; diff --git a/catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoActivity.java b/catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoActivity.java index 9030a90502e..781d2fb744d 100644 --- a/catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoActivity.java +++ b/catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoActivity.java @@ -22,12 +22,12 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import androidx.core.util.Consumer; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.util.Consumer; import androidx.drawerlayout.widget.DrawerLayout; import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter; import androidx.window.layout.DisplayFeature; diff --git a/catalog/java/io/material/catalog/datepicker/DatePickerMainDemoFragment.java b/catalog/java/io/material/catalog/datepicker/DatePickerMainDemoFragment.java index 94c3db4673e..99cc7ae0f5d 100644 --- a/catalog/java/io/material/catalog/datepicker/DatePickerMainDemoFragment.java +++ b/catalog/java/io/material/catalog/datepicker/DatePickerMainDemoFragment.java @@ -19,7 +19,6 @@ import android.content.Context; import android.os.Bundle; -import androidx.core.util.Pair; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; @@ -28,6 +27,7 @@ import android.widget.RadioGroup; import androidx.annotation.AttrRes; import androidx.annotation.Nullable; +import androidx.core.util.Pair; import com.google.android.material.button.MaterialButton; import com.google.android.material.datepicker.CalendarConstraints; import com.google.android.material.datepicker.CompositeDateValidator; diff --git a/catalog/java/io/material/catalog/feature/DemoUtils.java b/catalog/java/io/material/catalog/feature/DemoUtils.java index 84fa22d9f28..2822a178202 100644 --- a/catalog/java/io/material/catalog/feature/DemoUtils.java +++ b/catalog/java/io/material/catalog/feature/DemoUtils.java @@ -18,13 +18,13 @@ import android.app.Activity; import android.content.Context; -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 androidx.core.widget.NestedScrollView; import com.google.android.material.internal.ContextUtils; import com.google.android.material.snackbar.Snackbar; import java.util.ArrayList; diff --git a/catalog/java/io/material/catalog/font/FontMainDemoFragment.java b/catalog/java/io/material/catalog/font/FontMainDemoFragment.java index 5a5f624144f..9e167c77838 100644 --- a/catalog/java/io/material/catalog/font/FontMainDemoFragment.java +++ b/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.widget.TextViewCompat; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -38,6 +37,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StyleRes; import androidx.core.view.ViewCompat; +import androidx.core.widget.TextViewCompat; import com.google.android.material.resources.TextAppearance; import com.google.android.material.snackbar.Snackbar; import io.material.catalog.feature.DemoFragment; diff --git a/catalog/java/io/material/catalog/windowpreferences/WindowPreferencesManager.java b/catalog/java/io/material/catalog/windowpreferences/WindowPreferencesManager.java index 9c03dd56dcd..c67c8950546 100644 --- a/catalog/java/io/material/catalog/windowpreferences/WindowPreferencesManager.java +++ b/catalog/java/io/material/catalog/windowpreferences/WindowPreferencesManager.java @@ -28,10 +28,10 @@ import android.graphics.Color; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.ColorUtils; import android.view.View; import android.view.Window; import androidx.annotation.RequiresApi; +import androidx.core.graphics.ColorUtils; import com.google.android.material.color.MaterialColors; /** Helper that saves the current window preferences for the Catalog. */ diff --git a/lib/java/com/google/android/material/appbar/AppBarLayout.java b/lib/java/com/google/android/material/appbar/AppBarLayout.java index ffac5ac8e6b..dfc80376f00 100644 --- a/lib/java/com/google/android/material/appbar/AppBarLayout.java +++ b/lib/java/com/google/android/material/appbar/AppBarLayout.java @@ -38,8 +38,6 @@ import android.os.Build.VERSION_CODES; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.util.ObjectsCompat; import androidx.appcompat.content.res.AppCompatResources; import android.util.AttributeSet; import android.view.View; @@ -60,6 +58,8 @@ import androidx.annotation.RestrictTo; import androidx.annotation.VisibleForTesting; import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.util.ObjectsCompat; import androidx.core.view.NestedScrollingChild; import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat.NestedScrollType; diff --git a/lib/java/com/google/android/material/appbar/CollapsingToolbarLayout.java b/lib/java/com/google/android/material/appbar/CollapsingToolbarLayout.java index 1ff756e55c8..388b990cd98 100644 --- a/lib/java/com/google/android/material/appbar/CollapsingToolbarLayout.java +++ b/lib/java/com/google/android/material/appbar/CollapsingToolbarLayout.java @@ -35,8 +35,6 @@ import android.graphics.drawable.Drawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.util.ObjectsCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.Gravity; @@ -55,7 +53,9 @@ import androidx.annotation.RestrictTo; import androidx.annotation.StyleRes; import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.math.MathUtils; +import androidx.core.util.ObjectsCompat; import androidx.core.view.GravityCompat; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; diff --git a/lib/java/com/google/android/material/appbar/MaterialToolbar.java b/lib/java/com/google/android/material/appbar/MaterialToolbar.java index 661a00a94d7..0a1fdffd4cd 100644 --- a/lib/java/com/google/android/material/appbar/MaterialToolbar.java +++ b/lib/java/com/google/android/material/appbar/MaterialToolbar.java @@ -28,7 +28,6 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.drawable.DrawableCompat; import androidx.appcompat.widget.Toolbar; import android.util.AttributeSet; import android.util.Pair; @@ -38,6 +37,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.ViewCompat; import com.google.android.material.internal.ThemeEnforcement; import com.google.android.material.internal.ToolbarUtils; diff --git a/lib/java/com/google/android/material/bottomappbar/BottomAppBar.java b/lib/java/com/google/android/material/bottomappbar/BottomAppBar.java index daf78c575ee..e93706f6932 100644 --- a/lib/java/com/google/android/material/bottomappbar/BottomAppBar.java +++ b/lib/java/com/google/android/material/bottomappbar/BottomAppBar.java @@ -34,7 +34,6 @@ import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.graphics.drawable.DrawableCompat; import androidx.appcompat.widget.ActionMenuView; import androidx.appcompat.widget.Toolbar; import android.util.AttributeSet; @@ -50,6 +49,7 @@ import androidx.annotation.Px; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout.AttachedBehavior; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat.NestedScrollType; import androidx.core.view.ViewCompat.ScrollAxis; diff --git a/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java b/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java index 8e572c6b258..edd93944d08 100644 --- a/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java +++ b/lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java @@ -32,7 +32,6 @@ import android.os.Build.VERSION_CODES; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.graphics.Insets; import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; @@ -55,6 +54,7 @@ import androidx.annotation.VisibleForTesting; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams; +import androidx.core.graphics.Insets; import androidx.core.math.MathUtils; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; diff --git a/lib/java/com/google/android/material/button/MaterialButton.java b/lib/java/com/google/android/material/button/MaterialButton.java index 476438c90c1..c7f82c10863 100644 --- a/lib/java/com/google/android/material/button/MaterialButton.java +++ b/lib/java/com/google/android/material/button/MaterialButton.java @@ -33,8 +33,6 @@ import android.os.Build.VERSION_CODES; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.widget.TextViewCompat; import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.widget.AppCompatButton; import android.util.AttributeSet; @@ -55,7 +53,9 @@ import androidx.annotation.Px; import androidx.annotation.RequiresApi; import androidx.annotation.RestrictTo; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.ViewCompat; +import androidx.core.widget.TextViewCompat; import androidx.customview.view.AbsSavedState; import com.google.android.material.internal.ThemeEnforcement; import com.google.android.material.internal.ViewUtils; diff --git a/lib/java/com/google/android/material/button/MaterialButtonHelper.java b/lib/java/com/google/android/material/button/MaterialButtonHelper.java index e261ecf3656..d2ffee3ffa3 100644 --- a/lib/java/com/google/android/material/button/MaterialButtonHelper.java +++ b/lib/java/com/google/android/material/button/MaterialButtonHelper.java @@ -31,12 +31,12 @@ import android.graphics.drawable.RippleDrawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.drawable.DrawableCompat; import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.Dimension; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RestrictTo; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.ViewCompat; import com.google.android.material.color.MaterialColors; import com.google.android.material.internal.ViewUtils; diff --git a/lib/java/com/google/android/material/card/MaterialCardViewHelper.java b/lib/java/com/google/android/material/card/MaterialCardViewHelper.java index 18b1b7d94c1..26c7e926d35 100644 --- a/lib/java/com/google/android/material/card/MaterialCardViewHelper.java +++ b/lib/java/com/google/android/material/card/MaterialCardViewHelper.java @@ -33,7 +33,6 @@ import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.drawable.DrawableCompat; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; @@ -46,6 +45,7 @@ import androidx.annotation.RestrictTo; import androidx.annotation.StyleRes; import androidx.cardview.widget.CardView; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.ViewCompat; import com.google.android.material.card.MaterialCardView.CheckedIconGravity; import com.google.android.material.color.MaterialColors; diff --git a/lib/java/com/google/android/material/checkbox/MaterialCheckBox.java b/lib/java/com/google/android/material/checkbox/MaterialCheckBox.java index a47349bc66f..90b710de7bd 100644 --- a/lib/java/com/google/android/material/checkbox/MaterialCheckBox.java +++ b/lib/java/com/google/android/material/checkbox/MaterialCheckBox.java @@ -23,10 +23,10 @@ import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; -import androidx.core.widget.CompoundButtonCompat; import androidx.appcompat.widget.AppCompatCheckBox; import android.util.AttributeSet; import androidx.annotation.Nullable; +import androidx.core.widget.CompoundButtonCompat; import com.google.android.material.color.MaterialColors; import com.google.android.material.internal.ThemeEnforcement; import com.google.android.material.resources.MaterialResources; diff --git a/lib/java/com/google/android/material/chip/ChipDrawable.java b/lib/java/com/google/android/material/chip/ChipDrawable.java index ccb373729aa..e0bae333351 100644 --- a/lib/java/com/google/android/material/chip/ChipDrawable.java +++ b/lib/java/com/google/android/material/chip/ChipDrawable.java @@ -43,9 +43,6 @@ import android.graphics.drawable.ShapeDrawable; import android.graphics.drawable.shapes.OvalShape; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.ColorUtils; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.graphics.drawable.TintAwareDrawable; import androidx.appcompat.content.res.AppCompatResources; import android.text.TextUtils; import android.text.TextUtils.TruncateAt; @@ -65,6 +62,9 @@ import androidx.annotation.StringRes; import androidx.annotation.StyleRes; import androidx.annotation.XmlRes; +import androidx.core.graphics.ColorUtils; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.graphics.drawable.TintAwareDrawable; import androidx.core.text.BidiFormatter; import androidx.core.view.ViewCompat; import com.google.android.material.animation.MotionSpec; diff --git a/lib/java/com/google/android/material/color/MaterialColors.java b/lib/java/com/google/android/material/color/MaterialColors.java index ee9b7f5b493..dc29328917a 100644 --- a/lib/java/com/google/android/material/color/MaterialColors.java +++ b/lib/java/com/google/android/material/color/MaterialColors.java @@ -21,7 +21,6 @@ import android.content.Context; import android.graphics.Color; -import androidx.core.graphics.ColorUtils; import android.util.TypedValue; import android.view.View; import androidx.annotation.AttrRes; @@ -29,6 +28,7 @@ import androidx.annotation.FloatRange; import androidx.annotation.IntRange; import androidx.annotation.NonNull; +import androidx.core.graphics.ColorUtils; import com.google.android.material.resources.MaterialAttributes; /** diff --git a/lib/java/com/google/android/material/datepicker/CalendarConstraints.java b/lib/java/com/google/android/material/datepicker/CalendarConstraints.java index 485e0ca6fef..87af7906e34 100644 --- a/lib/java/com/google/android/material/datepicker/CalendarConstraints.java +++ b/lib/java/com/google/android/material/datepicker/CalendarConstraints.java @@ -18,9 +18,9 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.util.ObjectsCompat; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.util.ObjectsCompat; import java.util.Arrays; import java.util.Calendar; diff --git a/lib/java/com/google/android/material/datepicker/CalendarItemStyle.java b/lib/java/com/google/android/material/datepicker/CalendarItemStyle.java index a863466e9e4..f6ac4075aa4 100644 --- a/lib/java/com/google/android/material/datepicker/CalendarItemStyle.java +++ b/lib/java/com/google/android/material/datepicker/CalendarItemStyle.java @@ -26,10 +26,10 @@ import android.graphics.drawable.RippleDrawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.util.Preconditions; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.StyleRes; +import androidx.core.util.Preconditions; import androidx.core.view.ViewCompat; import com.google.android.material.resources.MaterialResources; import com.google.android.material.shape.MaterialShapeDrawable; diff --git a/lib/java/com/google/android/material/datepicker/DateSelector.java b/lib/java/com/google/android/material/datepicker/DateSelector.java index c35e3fe29db..c73c071ea48 100644 --- a/lib/java/com/google/android/material/datepicker/DateSelector.java +++ b/lib/java/com/google/android/material/datepicker/DateSelector.java @@ -20,7 +20,6 @@ import android.content.Context; import android.os.Bundle; import android.os.Parcelable; -import androidx.core.util.Pair; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -31,6 +30,7 @@ import androidx.annotation.RestrictTo.Scope; import androidx.annotation.StringRes; import androidx.annotation.StyleRes; +import androidx.core.util.Pair; import java.util.Collection; /** diff --git a/lib/java/com/google/android/material/datepicker/DateStrings.java b/lib/java/com/google/android/material/datepicker/DateStrings.java index 5d9cccbe716..8d52507ebdd 100644 --- a/lib/java/com/google/android/material/datepicker/DateStrings.java +++ b/lib/java/com/google/android/material/datepicker/DateStrings.java @@ -18,9 +18,9 @@ import android.icu.text.DateFormat; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.util.Pair; import android.text.format.DateUtils; import androidx.annotation.Nullable; +import androidx.core.util.Pair; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; diff --git a/lib/java/com/google/android/material/datepicker/MaterialCalendar.java b/lib/java/com/google/android/material/datepicker/MaterialCalendar.java index 810080a2f4c..0574ee5ac5e 100644 --- a/lib/java/com/google/android/material/datepicker/MaterialCalendar.java +++ b/lib/java/com/google/android/material/datepicker/MaterialCalendar.java @@ -23,7 +23,6 @@ import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import androidx.core.util.Pair; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.PagerSnapHelper; @@ -45,6 +44,7 @@ import androidx.annotation.RestrictTo.Scope; import androidx.annotation.StyleRes; import androidx.annotation.VisibleForTesting; +import androidx.core.util.Pair; import androidx.core.view.AccessibilityDelegateCompat; import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; diff --git a/lib/java/com/google/android/material/datepicker/MaterialCalendarGridView.java b/lib/java/com/google/android/material/datepicker/MaterialCalendarGridView.java index 63b632f2102..a860b50db6f 100644 --- a/lib/java/com/google/android/material/datepicker/MaterialCalendarGridView.java +++ b/lib/java/com/google/android/material/datepicker/MaterialCalendarGridView.java @@ -23,7 +23,6 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Rect; -import androidx.core.util.Pair; import android.util.AttributeSet; import android.view.KeyEvent; import android.view.View; @@ -32,6 +31,7 @@ import android.widget.ListAdapter; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.util.Pair; import androidx.core.view.AccessibilityDelegateCompat; import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; diff --git a/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java b/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java index 29d3362379a..e9253b3e882 100644 --- a/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java +++ b/lib/java/com/google/android/material/datepicker/MaterialDatePicker.java @@ -33,7 +33,6 @@ import android.os.Bundle; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentTransaction; -import androidx.core.util.Pair; import androidx.appcompat.content.res.AppCompatResources; import android.view.LayoutInflater; import android.view.View; @@ -49,6 +48,7 @@ import androidx.annotation.RestrictTo; import androidx.annotation.StringRes; import androidx.annotation.StyleRes; +import androidx.core.util.Pair; import androidx.core.view.ViewCompat; import com.google.android.material.dialog.InsetDialogOnTouchListener; import com.google.android.material.internal.CheckableImageButton; diff --git a/lib/java/com/google/android/material/datepicker/RangeDateSelector.java b/lib/java/com/google/android/material/datepicker/RangeDateSelector.java index 0869f7c1b3a..ef7294b5e99 100644 --- a/lib/java/com/google/android/material/datepicker/RangeDateSelector.java +++ b/lib/java/com/google/android/material/datepicker/RangeDateSelector.java @@ -22,8 +22,6 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.util.Pair; -import androidx.core.util.Preconditions; import android.text.InputType; import android.util.DisplayMetrics; import android.view.LayoutInflater; @@ -34,6 +32,8 @@ import androidx.annotation.Nullable; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; +import androidx.core.util.Pair; +import androidx.core.util.Preconditions; import com.google.android.material.internal.ManufacturerUtils; import com.google.android.material.internal.ViewUtils; import com.google.android.material.resources.MaterialAttributes; diff --git a/lib/java/com/google/android/material/datepicker/SingleDateSelector.java b/lib/java/com/google/android/material/datepicker/SingleDateSelector.java index 4170e7a9199..7a87ea49be4 100644 --- a/lib/java/com/google/android/material/datepicker/SingleDateSelector.java +++ b/lib/java/com/google/android/material/datepicker/SingleDateSelector.java @@ -22,7 +22,6 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.util.Pair; import android.text.InputType; import android.view.LayoutInflater; import android.view.View; @@ -32,6 +31,7 @@ import androidx.annotation.Nullable; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; +import androidx.core.util.Pair; import com.google.android.material.internal.ManufacturerUtils; import com.google.android.material.internal.ViewUtils; import com.google.android.material.resources.MaterialAttributes; diff --git a/lib/java/com/google/android/material/divider/MaterialDividerItemDecoration.java b/lib/java/com/google/android/material/divider/MaterialDividerItemDecoration.java index 5f3692c599c..7dca340d050 100644 --- a/lib/java/com/google/android/material/divider/MaterialDividerItemDecoration.java +++ b/lib/java/com/google/android/material/divider/MaterialDividerItemDecoration.java @@ -24,7 +24,6 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.ShapeDrawable; -import androidx.core.graphics.drawable.DrawableCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.ItemDecoration; @@ -38,6 +37,7 @@ import androidx.annotation.Nullable; import androidx.annotation.Px; import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.ViewCompat; import com.google.android.material.internal.ThemeEnforcement; import com.google.android.material.resources.MaterialResources; diff --git a/lib/java/com/google/android/material/elevation/ElevationOverlayProvider.java b/lib/java/com/google/android/material/elevation/ElevationOverlayProvider.java index 2bbb1f58bb5..4692c7ed95e 100644 --- a/lib/java/com/google/android/material/elevation/ElevationOverlayProvider.java +++ b/lib/java/com/google/android/material/elevation/ElevationOverlayProvider.java @@ -20,10 +20,10 @@ import android.content.Context; import android.graphics.Color; -import androidx.core.graphics.ColorUtils; import android.view.View; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; +import androidx.core.graphics.ColorUtils; import com.google.android.material.color.MaterialColors; import com.google.android.material.internal.ViewUtils; import com.google.android.material.resources.MaterialAttributes; diff --git a/lib/java/com/google/android/material/floatingactionbutton/BaseMotionStrategy.java b/lib/java/com/google/android/material/floatingactionbutton/BaseMotionStrategy.java index e6a9685e4d0..c0489b590de 100644 --- a/lib/java/com/google/android/material/floatingactionbutton/BaseMotionStrategy.java +++ b/lib/java/com/google/android/material/floatingactionbutton/BaseMotionStrategy.java @@ -25,12 +25,12 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Color; -import androidx.core.util.Preconditions; import android.util.Property; import android.view.View; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.util.Preconditions; import com.google.android.material.animation.AnimatorSetCompat; import com.google.android.material.animation.MotionSpec; import java.util.ArrayList; diff --git a/lib/java/com/google/android/material/floatingactionbutton/BorderDrawable.java b/lib/java/com/google/android/material/floatingactionbutton/BorderDrawable.java index 986995a6bc2..6b1a3a31bbc 100644 --- a/lib/java/com/google/android/material/floatingactionbutton/BorderDrawable.java +++ b/lib/java/com/google/android/material/floatingactionbutton/BorderDrawable.java @@ -32,13 +32,13 @@ import android.graphics.Shader; import android.graphics.drawable.Drawable; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.ColorUtils; import androidx.annotation.ColorInt; import androidx.annotation.Dimension; import androidx.annotation.IntRange; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RestrictTo; +import androidx.core.graphics.ColorUtils; import com.google.android.material.shape.ShapeAppearanceModel; import com.google.android.material.shape.ShapeAppearancePathProvider; diff --git a/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java b/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java index 02c694fc15a..8316fc5b729 100644 --- a/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java +++ b/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java @@ -18,8 +18,8 @@ import com.google.android.material.R; -import static androidx.core.util.Preconditions.checkNotNull; import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.core.util.Preconditions.checkNotNull; import static com.google.android.material.theme.overlay.MaterialThemeOverlay.wrap; import android.animation.Animator.AnimatorListener; @@ -36,8 +36,6 @@ import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.Parcelable; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.widget.TintableImageSourceView; import androidx.appcompat.widget.AppCompatDrawableManager; import androidx.appcompat.widget.AppCompatImageHelper; import android.util.AttributeSet; @@ -60,8 +58,10 @@ import androidx.annotation.RestrictTo; import androidx.annotation.VisibleForTesting; import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.TintableBackgroundView; import androidx.core.view.ViewCompat; +import androidx.core.widget.TintableImageSourceView; import com.google.android.material.animation.MotionSpec; import com.google.android.material.animation.TransformationCallback; import com.google.android.material.appbar.AppBarLayout; diff --git a/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java b/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java index 11442a6b8eb..394698e4143 100644 --- a/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java +++ b/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java @@ -41,12 +41,12 @@ import android.graphics.drawable.InsetDrawable; import android.graphics.drawable.LayerDrawable; import android.os.Build; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.util.Preconditions; import android.view.View; import android.view.ViewTreeObserver; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.util.Preconditions; import androidx.core.view.ViewCompat; import com.google.android.material.animation.AnimationUtils; import com.google.android.material.animation.AnimatorSetCompat; diff --git a/lib/java/com/google/android/material/internal/CollapsingTextHelper.java b/lib/java/com/google/android/material/internal/CollapsingTextHelper.java index 7c440e8acb3..63d7a132658 100644 --- a/lib/java/com/google/android/material/internal/CollapsingTextHelper.java +++ b/lib/java/com/google/android/material/internal/CollapsingTextHelper.java @@ -16,11 +16,11 @@ package com.google.android.material.internal; -import static androidx.core.util.Preconditions.checkNotNull; import static android.text.Layout.Alignment.ALIGN_CENTER; import static android.text.Layout.Alignment.ALIGN_NORMAL; import static android.text.Layout.Alignment.ALIGN_OPPOSITE; import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.core.util.Preconditions.checkNotNull; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/lib/java/com/google/android/material/internal/NavigationMenuItemView.java b/lib/java/com/google/android/material/internal/NavigationMenuItemView.java index 04c35ec70f3..4020665530f 100644 --- a/lib/java/com/google/android/material/internal/NavigationMenuItemView.java +++ b/lib/java/com/google/android/material/internal/NavigationMenuItemView.java @@ -26,9 +26,6 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.StateListDrawable; -import androidx.core.content.res.ResourcesCompat; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.widget.TextViewCompat; import androidx.appcompat.view.menu.MenuItemImpl; import androidx.appcompat.view.menu.MenuView; import androidx.appcompat.widget.TooltipCompat; @@ -43,10 +40,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RestrictTo; +import androidx.core.content.res.ResourcesCompat; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.AccessibilityDelegateCompat; import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityEventCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.widget.TextViewCompat; /** @hide */ @RestrictTo(LIBRARY_GROUP) diff --git a/lib/java/com/google/android/material/internal/NavigationMenuPresenter.java b/lib/java/com/google/android/material/internal/NavigationMenuPresenter.java index fb665299a85..6751aa65777 100644 --- a/lib/java/com/google/android/material/internal/NavigationMenuPresenter.java +++ b/lib/java/com/google/android/material/internal/NavigationMenuPresenter.java @@ -26,7 +26,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Parcelable; -import androidx.core.widget.TextViewCompat; import androidx.appcompat.view.menu.MenuBuilder; import androidx.appcompat.view.menu.MenuItemImpl; import androidx.appcompat.view.menu.MenuPresenter; @@ -52,6 +51,7 @@ import androidx.core.view.WindowInsetsCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionInfoCompat; +import androidx.core.widget.TextViewCompat; import java.util.ArrayList; /** @hide */ diff --git a/lib/java/com/google/android/material/motion/MotionUtils.java b/lib/java/com/google/android/material/motion/MotionUtils.java index bec1a796a7c..d3d2842fc42 100644 --- a/lib/java/com/google/android/material/motion/MotionUtils.java +++ b/lib/java/com/google/android/material/motion/MotionUtils.java @@ -19,11 +19,11 @@ import android.animation.TimeInterpolator; import android.content.Context; -import androidx.core.graphics.PathParser; import android.util.TypedValue; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; +import androidx.core.graphics.PathParser; import androidx.core.view.animation.PathInterpolatorCompat; import com.google.android.material.resources.MaterialAttributes; diff --git a/lib/java/com/google/android/material/navigation/NavigationBarItemView.java b/lib/java/com/google/android/material/navigation/NavigationBarItemView.java index ba85e95f7bb..cfdee9e838c 100644 --- a/lib/java/com/google/android/material/navigation/NavigationBarItemView.java +++ b/lib/java/com/google/android/material/navigation/NavigationBarItemView.java @@ -29,8 +29,6 @@ import android.graphics.drawable.Drawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.widget.TextViewCompat; import androidx.appcompat.view.menu.MenuItemImpl; import androidx.appcompat.view.menu.MenuView; import androidx.appcompat.widget.TooltipCompat; @@ -53,11 +51,13 @@ import androidx.annotation.RestrictTo; import androidx.annotation.StyleRes; import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.PointerIconCompat; import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionItemInfoCompat; +import androidx.core.widget.TextViewCompat; import com.google.android.material.animation.AnimationUtils; import com.google.android.material.badge.BadgeDrawable; import com.google.android.material.badge.BadgeUtils; diff --git a/lib/java/com/google/android/material/navigation/NavigationBarMenuView.java b/lib/java/com/google/android/material/navigation/NavigationBarMenuView.java index bd4b43d9e13..d20d51bdd67 100644 --- a/lib/java/com/google/android/material/navigation/NavigationBarMenuView.java +++ b/lib/java/com/google/android/material/navigation/NavigationBarMenuView.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; -import androidx.core.util.Pools; import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.view.menu.MenuBuilder; import androidx.appcompat.view.menu.MenuItemImpl; @@ -42,6 +41,7 @@ import androidx.annotation.Px; import androidx.annotation.RestrictTo; import androidx.annotation.StyleRes; +import androidx.core.util.Pools; import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionInfoCompat; diff --git a/lib/java/com/google/android/material/navigation/NavigationBarView.java b/lib/java/com/google/android/material/navigation/NavigationBarView.java index ece70bb54b1..80996e7713a 100644 --- a/lib/java/com/google/android/material/navigation/NavigationBarView.java +++ b/lib/java/com/google/android/material/navigation/NavigationBarView.java @@ -34,7 +34,6 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.graphics.drawable.DrawableCompat; import androidx.appcompat.view.SupportMenuInflater; import androidx.appcompat.view.menu.MenuBuilder; import androidx.appcompat.view.menu.MenuView; @@ -55,6 +54,7 @@ import androidx.annotation.Px; import androidx.annotation.RestrictTo; import androidx.annotation.StyleRes; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.ViewCompat; import androidx.customview.view.AbsSavedState; import com.google.android.material.badge.BadgeDrawable; diff --git a/lib/java/com/google/android/material/radiobutton/MaterialRadioButton.java b/lib/java/com/google/android/material/radiobutton/MaterialRadioButton.java index 106a4e8993c..2b4d3d84e23 100644 --- a/lib/java/com/google/android/material/radiobutton/MaterialRadioButton.java +++ b/lib/java/com/google/android/material/radiobutton/MaterialRadioButton.java @@ -23,11 +23,11 @@ import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; -import androidx.core.widget.CompoundButtonCompat; import androidx.appcompat.widget.AppCompatRadioButton; import android.util.AttributeSet; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.widget.CompoundButtonCompat; import com.google.android.material.color.MaterialColors; import com.google.android.material.internal.ThemeEnforcement; import com.google.android.material.resources.MaterialResources; diff --git a/lib/java/com/google/android/material/resources/CancelableFontCallback.java b/lib/java/com/google/android/material/resources/CancelableFontCallback.java index f473eda8a11..951af36a762 100644 --- a/lib/java/com/google/android/material/resources/CancelableFontCallback.java +++ b/lib/java/com/google/android/material/resources/CancelableFontCallback.java @@ -17,9 +17,9 @@ package com.google.android.material.resources; import android.graphics.Typeface; -import androidx.core.content.res.ResourcesCompat.FontCallback; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; +import androidx.core.content.res.ResourcesCompat.FontCallback; /** * {@link FontCallback} allowing cancelling of pending async font fetch, in case a different font is diff --git a/lib/java/com/google/android/material/resources/TextAppearance.java b/lib/java/com/google/android/material/resources/TextAppearance.java index 4be836b7db3..f593b17cbee 100644 --- a/lib/java/com/google/android/material/resources/TextAppearance.java +++ b/lib/java/com/google/android/material/resources/TextAppearance.java @@ -26,8 +26,6 @@ import android.graphics.Typeface; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.content.res.ResourcesCompat; -import androidx.core.content.res.ResourcesCompat.FontCallback; import android.text.TextPaint; import android.util.Log; import androidx.annotation.FontRes; @@ -37,6 +35,8 @@ import androidx.annotation.RestrictTo.Scope; import androidx.annotation.StyleRes; import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.ResourcesCompat; +import androidx.core.content.res.ResourcesCompat.FontCallback; import androidx.core.provider.FontsContractCompat.FontRequestCallback; /** diff --git a/lib/java/com/google/android/material/resources/TextAppearanceFontCallback.java b/lib/java/com/google/android/material/resources/TextAppearanceFontCallback.java index c13a241a674..ec031a68b29 100644 --- a/lib/java/com/google/android/material/resources/TextAppearanceFontCallback.java +++ b/lib/java/com/google/android/material/resources/TextAppearanceFontCallback.java @@ -17,9 +17,9 @@ package com.google.android.material.resources; import android.graphics.Typeface; -import androidx.core.content.res.ResourcesCompat.FontCallback; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; +import androidx.core.content.res.ResourcesCompat.FontCallback; /** * {@link FontCallback} font fetch, in case a different font is set / requested in the meantime. diff --git a/lib/java/com/google/android/material/ripple/RippleDrawableCompat.java b/lib/java/com/google/android/material/ripple/RippleDrawableCompat.java index 79c44b7a51d..891d14500b4 100644 --- a/lib/java/com/google/android/material/ripple/RippleDrawableCompat.java +++ b/lib/java/com/google/android/material/ripple/RippleDrawableCompat.java @@ -22,12 +22,12 @@ import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.core.graphics.drawable.TintAwareDrawable; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; +import androidx.core.graphics.drawable.TintAwareDrawable; import com.google.android.material.shape.MaterialShapeDrawable; import com.google.android.material.shape.ShapeAppearanceModel; import com.google.android.material.shape.Shapeable; diff --git a/lib/java/com/google/android/material/ripple/RippleUtils.java b/lib/java/com/google/android/material/ripple/RippleUtils.java index f2b1f267179..259106b7f29 100644 --- a/lib/java/com/google/android/material/ripple/RippleUtils.java +++ b/lib/java/com/google/android/material/ripple/RippleUtils.java @@ -21,7 +21,6 @@ import android.graphics.Color; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.ColorUtils; import android.util.Log; import android.util.StateSet; import androidx.annotation.ColorInt; @@ -30,6 +29,7 @@ import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; import androidx.annotation.VisibleForTesting; +import androidx.core.graphics.ColorUtils; /** * Utils class for ripples. diff --git a/lib/java/com/google/android/material/shadow/ShadowRenderer.java b/lib/java/com/google/android/material/shadow/ShadowRenderer.java index 6411c4da2bb..6b5532329b5 100644 --- a/lib/java/com/google/android/material/shadow/ShadowRenderer.java +++ b/lib/java/com/google/android/material/shadow/ShadowRenderer.java @@ -29,10 +29,10 @@ import android.graphics.Region.Op; import android.graphics.Shader; import android.graphics.Shader.TileMode; -import androidx.core.graphics.ColorUtils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RestrictTo; +import androidx.core.graphics.ColorUtils; /** * A helper class to draw linear or radial shadows using gradient shaders. diff --git a/lib/java/com/google/android/material/shape/MaterialShapeDrawable.java b/lib/java/com/google/android/material/shape/MaterialShapeDrawable.java index 8b73ce416d9..617d0129db2 100644 --- a/lib/java/com/google/android/material/shape/MaterialShapeDrawable.java +++ b/lib/java/com/google/android/material/shape/MaterialShapeDrawable.java @@ -46,8 +46,6 @@ import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Looper; -import androidx.core.graphics.drawable.TintAwareDrawable; -import androidx.core.util.ObjectsCompat; import android.util.AttributeSet; import android.util.Log; import androidx.annotation.AttrRes; @@ -58,6 +56,8 @@ import androidx.annotation.Nullable; import androidx.annotation.RestrictTo; import androidx.annotation.StyleRes; +import androidx.core.graphics.drawable.TintAwareDrawable; +import androidx.core.util.ObjectsCompat; import com.google.android.material.color.MaterialColors; import com.google.android.material.elevation.ElevationOverlayProvider; import com.google.android.material.shadow.ShadowRenderer; diff --git a/lib/java/com/google/android/material/slider/BaseSlider.java b/lib/java/com/google/android/material/slider/BaseSlider.java index 17e6ed203a9..224cd8ae6b2 100644 --- a/lib/java/com/google/android/material/slider/BaseSlider.java +++ b/lib/java/com/google/android/material/slider/BaseSlider.java @@ -51,7 +51,6 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.graphics.drawable.DrawableCompat; import androidx.appcompat.content.res.AppCompatResources; import android.util.AttributeSet; import android.util.Log; @@ -73,6 +72,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.RangeInfoCompat; diff --git a/lib/java/com/google/android/material/snackbar/BaseTransientBottomBar.java b/lib/java/com/google/android/material/snackbar/BaseTransientBottomBar.java index 4a6b8ef85a8..7845f3b8079 100644 --- a/lib/java/com/google/android/material/snackbar/BaseTransientBottomBar.java +++ b/lib/java/com/google/android/material/snackbar/BaseTransientBottomBar.java @@ -45,7 +45,6 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; -import androidx.core.graphics.drawable.DrawableCompat; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.Log; @@ -71,6 +70,7 @@ import androidx.annotation.RequiresApi; import androidx.annotation.RestrictTo; import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.view.AccessibilityDelegateCompat; import androidx.core.view.OnApplyWindowInsetsListener; import androidx.core.view.ViewCompat; diff --git a/lib/java/com/google/android/material/tabs/TabLayout.java b/lib/java/com/google/android/material/tabs/TabLayout.java index b2152d68e63..c8c1e18b900 100644 --- a/lib/java/com/google/android/material/tabs/TabLayout.java +++ b/lib/java/com/google/android/material/tabs/TabLayout.java @@ -45,9 +45,6 @@ import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.util.Pools; -import androidx.core.widget.TextViewCompat; import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.widget.TooltipCompat; import android.text.Layout; @@ -80,6 +77,8 @@ import androidx.annotation.RequiresApi; import androidx.annotation.RestrictTo; import androidx.annotation.StringRes; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.util.Pools; import androidx.core.view.GravityCompat; import androidx.core.view.MarginLayoutParamsCompat; import androidx.core.view.PointerIconCompat; @@ -88,6 +87,7 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionInfoCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.CollectionItemInfoCompat; +import androidx.core.widget.TextViewCompat; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import com.google.android.material.badge.BadgeDrawable; diff --git a/lib/java/com/google/android/material/textfield/IndicatorViewController.java b/lib/java/com/google/android/material/textfield/IndicatorViewController.java index 749e6f90c8c..e7f6e4d8489 100644 --- a/lib/java/com/google/android/material/textfield/IndicatorViewController.java +++ b/lib/java/com/google/android/material/textfield/IndicatorViewController.java @@ -30,7 +30,6 @@ import android.graphics.Typeface; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.widget.TextViewCompat; import androidx.appcompat.widget.AppCompatTextView; import android.text.TextUtils; import android.view.View; @@ -49,6 +48,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StyleRes; import androidx.core.view.ViewCompat; +import androidx.core.widget.TextViewCompat; import com.google.android.material.animation.AnimationUtils; import com.google.android.material.animation.AnimatorSetCompat; import com.google.android.material.resources.MaterialResources; diff --git a/lib/java/com/google/android/material/textfield/TextInputLayout.java b/lib/java/com/google/android/material/textfield/TextInputLayout.java index f2b8bcc7f14..75c0b1bab0a 100644 --- a/lib/java/com/google/android/material/textfield/TextInputLayout.java +++ b/lib/java/com/google/android/material/textfield/TextInputLayout.java @@ -39,8 +39,6 @@ import android.os.Build.VERSION_CODES; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.core.widget.TextViewCompat; import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.widget.AppCompatDrawableManager; import androidx.appcompat.widget.AppCompatTextView; @@ -75,12 +73,14 @@ import androidx.annotation.StyleRes; import androidx.annotation.VisibleForTesting; import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.text.BidiFormatter; import androidx.core.view.AccessibilityDelegateCompat; import androidx.core.view.GravityCompat; import androidx.core.view.MarginLayoutParamsCompat; import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.widget.TextViewCompat; import androidx.customview.view.AbsSavedState; import androidx.transition.Fade; import androidx.transition.TransitionManager; diff --git a/lib/java/com/google/android/material/tooltip/TooltipDrawable.java b/lib/java/com/google/android/material/tooltip/TooltipDrawable.java index 055f00a9e57..1dc01816213 100644 --- a/lib/java/com/google/android/material/tooltip/TooltipDrawable.java +++ b/lib/java/com/google/android/material/tooltip/TooltipDrawable.java @@ -28,7 +28,6 @@ import android.graphics.Paint.Align; import android.graphics.Paint.FontMetrics; import android.graphics.Rect; -import androidx.core.graphics.ColorUtils; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; @@ -41,6 +40,7 @@ import androidx.annotation.RestrictTo; import androidx.annotation.StringRes; import androidx.annotation.StyleRes; +import androidx.core.graphics.ColorUtils; import com.google.android.material.animation.AnimationUtils; import com.google.android.material.color.MaterialColors; import com.google.android.material.internal.TextDrawableHelper; diff --git a/lib/java/com/google/android/material/transition/MaterialContainerTransform.java b/lib/java/com/google/android/material/transition/MaterialContainerTransform.java index 40bbb39db13..a18900671e1 100644 --- a/lib/java/com/google/android/material/transition/MaterialContainerTransform.java +++ b/lib/java/com/google/android/material/transition/MaterialContainerTransform.java @@ -18,8 +18,8 @@ import com.google.android.material.R; -import static androidx.core.util.Preconditions.checkNotNull; import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.core.util.Preconditions.checkNotNull; import static com.google.android.material.transition.TransitionUtils.calculateArea; import static com.google.android.material.transition.TransitionUtils.convertToRelativeCornerSizes; import static com.google.android.material.transition.TransitionUtils.createColorShader; diff --git a/lib/java/com/google/android/material/transition/TransitionUtils.java b/lib/java/com/google/android/material/transition/TransitionUtils.java index 2ff23e6097c..73df699b2be 100644 --- a/lib/java/com/google/android/material/transition/TransitionUtils.java +++ b/lib/java/com/google/android/material/transition/TransitionUtils.java @@ -25,7 +25,6 @@ import android.graphics.Shader; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.PathParser; import android.util.TypedValue; import android.view.View; import android.view.ViewParent; @@ -35,6 +34,7 @@ import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.graphics.PathParser; import androidx.transition.PathMotion; import androidx.transition.PatternPathMotion; import androidx.transition.Transition; diff --git a/lib/java/com/google/android/material/transition/platform/MaterialContainerTransform.java b/lib/java/com/google/android/material/transition/platform/MaterialContainerTransform.java index b710a6d4c9c..9541f92d197 100644 --- a/lib/java/com/google/android/material/transition/platform/MaterialContainerTransform.java +++ b/lib/java/com/google/android/material/transition/platform/MaterialContainerTransform.java @@ -22,8 +22,8 @@ import com.google.android.material.R; -import static androidx.core.util.Preconditions.checkNotNull; import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; +import static androidx.core.util.Preconditions.checkNotNull; import static com.google.android.material.transition.platform.TransitionUtils.calculateArea; import static com.google.android.material.transition.platform.TransitionUtils.convertToRelativeCornerSizes; import static com.google.android.material.transition.platform.TransitionUtils.createColorShader; diff --git a/lib/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java b/lib/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java index 1bc12fe7671..8dfb3837b83 100644 --- a/lib/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java +++ b/lib/java/com/google/android/material/transition/platform/MaterialContainerTransformSharedElementCallback.java @@ -30,8 +30,6 @@ import android.graphics.drawable.Drawable; import android.os.Build.VERSION_CODES; import android.os.Parcelable; -import androidx.core.graphics.BlendModeColorFilterCompat; -import androidx.core.graphics.BlendModeCompat; import android.transition.Transition; import android.view.View; import android.view.View.MeasureSpec; @@ -39,6 +37,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; +import androidx.core.graphics.BlendModeColorFilterCompat; +import androidx.core.graphics.BlendModeCompat; import com.google.android.material.internal.ContextUtils; import com.google.android.material.shape.ShapeAppearanceModel; import com.google.android.material.shape.Shapeable; diff --git a/lib/java/com/google/android/material/transition/platform/TransitionUtils.java b/lib/java/com/google/android/material/transition/platform/TransitionUtils.java index 514b7467cfd..9419bd5bf47 100644 --- a/lib/java/com/google/android/material/transition/platform/TransitionUtils.java +++ b/lib/java/com/google/android/material/transition/platform/TransitionUtils.java @@ -29,7 +29,6 @@ import android.graphics.Shader; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.PathParser; import android.util.TypedValue; import android.view.View; import android.view.ViewParent; @@ -39,6 +38,7 @@ import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.graphics.PathParser; import android.transition.PathMotion; import android.transition.PatternPathMotion; import android.transition.Transition; diff --git a/lib/javatests/com/google/android/material/badge/BadgeDrawableTest.java b/lib/javatests/com/google/android/material/badge/BadgeDrawableTest.java index 7db19850019..322ede4e35c 100644 --- a/lib/javatests/com/google/android/material/badge/BadgeDrawableTest.java +++ b/lib/javatests/com/google/android/material/badge/BadgeDrawableTest.java @@ -22,12 +22,12 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.Parcel; -import androidx.core.content.res.ResourcesCompat; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; import androidx.annotation.StyleRes; import androidx.annotation.XmlRes; +import androidx.core.content.res.ResourcesCompat; import androidx.test.core.app.ApplicationProvider; import com.google.android.material.badge.BadgeDrawable.SavedState; import com.google.android.material.drawable.DrawableUtils; diff --git a/lib/javatests/com/google/android/material/button/MaterialButtonTest.java b/lib/javatests/com/google/android/material/button/MaterialButtonTest.java index 54ddf2aeb60..6bca637637c 100644 --- a/lib/javatests/com/google/android/material/button/MaterialButtonTest.java +++ b/lib/javatests/com/google/android/material/button/MaterialButtonTest.java @@ -22,10 +22,10 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.core.graphics.drawable.DrawableCompat; import android.view.View.MeasureSpec; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.test.core.app.ApplicationProvider; import com.google.android.material.shape.CornerFamily; import com.google.android.material.shape.CornerTreatment; diff --git a/lib/javatests/com/google/android/material/checkbox/MaterialCheckBoxTest.java b/lib/javatests/com/google/android/material/checkbox/MaterialCheckBoxTest.java index ca56c7310c4..5875705ce7b 100644 --- a/lib/javatests/com/google/android/material/checkbox/MaterialCheckBoxTest.java +++ b/lib/javatests/com/google/android/material/checkbox/MaterialCheckBoxTest.java @@ -24,10 +24,10 @@ import android.graphics.Color; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import androidx.core.widget.CompoundButtonCompat; import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CheckBox; +import androidx.core.widget.CompoundButtonCompat; import com.google.android.material.color.MaterialColors; import org.junit.Before; import org.junit.Test; diff --git a/lib/javatests/com/google/android/material/datepicker/RangeDateSelectorTest.java b/lib/javatests/com/google/android/material/datepicker/RangeDateSelectorTest.java index a471225ba0e..99a266af1c7 100644 --- a/lib/javatests/com/google/android/material/datepicker/RangeDateSelectorTest.java +++ b/lib/javatests/com/google/android/material/datepicker/RangeDateSelectorTest.java @@ -20,12 +20,12 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.core.util.Pair; import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.View; import android.widget.GridView; import android.widget.TextView.BufferType; +import androidx.core.util.Pair; import androidx.test.core.app.ApplicationProvider; import com.google.android.material.internal.ParcelableTestUtils; import com.google.android.material.textfield.TextInputLayout; diff --git a/lib/javatests/com/google/android/material/elevation/ElevationOverlayProviderTest.java b/lib/javatests/com/google/android/material/elevation/ElevationOverlayProviderTest.java index 7c1622d3a99..dd907e15afd 100644 --- a/lib/javatests/com/google/android/material/elevation/ElevationOverlayProviderTest.java +++ b/lib/javatests/com/google/android/material/elevation/ElevationOverlayProviderTest.java @@ -23,10 +23,10 @@ import android.content.Context; import android.graphics.Color; import android.os.Build.VERSION_CODES; -import androidx.core.graphics.ColorUtils; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; +import androidx.core.graphics.ColorUtils; import androidx.core.view.ViewCompat; import androidx.test.core.app.ApplicationProvider; import com.google.android.material.color.MaterialColors; diff --git a/lib/javatests/com/google/android/material/radiobutton/MaterialRadioButtonTest.java b/lib/javatests/com/google/android/material/radiobutton/MaterialRadioButtonTest.java index ea696002b91..b0d841f2b18 100644 --- a/lib/javatests/com/google/android/material/radiobutton/MaterialRadioButtonTest.java +++ b/lib/javatests/com/google/android/material/radiobutton/MaterialRadioButtonTest.java @@ -24,10 +24,10 @@ import android.graphics.Color; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import androidx.core.widget.CompoundButtonCompat; import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.RadioButton; +import androidx.core.widget.CompoundButtonCompat; import com.google.android.material.color.MaterialColors; import org.junit.Before; import org.junit.Test; diff --git a/tests/javatests/com/google/android/material/bottomnavigation/BottomNavigationViewTest.java b/tests/javatests/com/google/android/material/bottomnavigation/BottomNavigationViewTest.java index ff27b52007b..20fa8a03805 100644 --- a/tests/javatests/com/google/android/material/bottomnavigation/BottomNavigationViewTest.java +++ b/tests/javatests/com/google/android/material/bottomnavigation/BottomNavigationViewTest.java @@ -47,7 +47,6 @@ import android.content.res.Resources; import android.os.Build; import android.os.Parcelable; -import androidx.core.content.res.ResourcesCompat; import android.util.SparseArray; import android.view.Menu; import android.view.MenuItem; @@ -56,6 +55,7 @@ import android.view.View; import android.view.ViewGroup; import androidx.annotation.ColorInt; +import androidx.core.content.res.ResourcesCompat; import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat; diff --git a/tests/javatests/com/google/android/material/bottomsheet/BottomSheetBehaviorTest.java b/tests/javatests/com/google/android/material/bottomsheet/BottomSheetBehaviorTest.java index 2723bee4ecd..0a4897976b7 100644 --- a/tests/javatests/com/google/android/material/bottomsheet/BottomSheetBehaviorTest.java +++ b/tests/javatests/com/google/android/material/bottomsheet/BottomSheetBehaviorTest.java @@ -27,7 +27,6 @@ import android.content.Context; import android.os.Build.VERSION; import android.os.SystemClock; -import androidx.core.widget.NestedScrollView; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -38,6 +37,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.view.ViewCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.core.widget.NestedScrollView; import androidx.test.espresso.Espresso; import androidx.test.espresso.IdlingResource; import androidx.test.espresso.UiController; diff --git a/tests/javatests/com/google/android/material/datepicker/MaterialDatePickerTestUtils.java b/tests/javatests/com/google/android/material/datepicker/MaterialDatePickerTestUtils.java index 1c929adcb3a..71b62fba475 100644 --- a/tests/javatests/com/google/android/material/datepicker/MaterialDatePickerTestUtils.java +++ b/tests/javatests/com/google/android/material/datepicker/MaterialDatePickerTestUtils.java @@ -28,7 +28,6 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import androidx.core.util.Pair; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -36,6 +35,7 @@ import android.view.ViewGroup; import android.widget.EditText; import androidx.annotation.VisibleForTesting; +import androidx.core.util.Pair; import androidx.test.espresso.ViewInteraction; import androidx.test.espresso.action.CoordinatesProvider; import androidx.test.espresso.action.GeneralLocation; diff --git a/tests/javatests/com/google/android/material/navigation/NavigationViewTest.java b/tests/javatests/com/google/android/material/navigation/NavigationViewTest.java index 8d46e83dad7..15b9ca2a63f 100644 --- a/tests/javatests/com/google/android/material/navigation/NavigationViewTest.java +++ b/tests/javatests/com/google/android/material/navigation/NavigationViewTest.java @@ -62,7 +62,6 @@ import android.content.res.Resources; import android.os.Build; import android.os.Parcelable; -import androidx.core.content.res.ResourcesCompat; import androidx.recyclerview.widget.RecyclerView; import androidx.appcompat.widget.SwitchCompat; import android.util.SparseArray; @@ -73,6 +72,7 @@ import android.widget.TextView; import androidx.annotation.ColorInt; import androidx.annotation.IdRes; +import androidx.core.content.res.ResourcesCompat; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.test.espresso.matcher.ViewMatchers.Visibility; diff --git a/tests/javatests/com/google/android/material/testutils/TestUtilsActions.java b/tests/javatests/com/google/android/material/testutils/TestUtilsActions.java index 98445a57341..7560a6a6bd3 100644 --- a/tests/javatests/com/google/android/material/testutils/TestUtilsActions.java +++ b/tests/javatests/com/google/android/material/testutils/TestUtilsActions.java @@ -25,7 +25,6 @@ import android.graphics.drawable.Drawable; import android.os.Build.VERSION_CODES; import android.os.Parcelable; -import androidx.core.widget.TextViewCompat; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; @@ -36,6 +35,7 @@ import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.core.view.ViewCompat; +import androidx.core.widget.TextViewCompat; import androidx.test.espresso.UiController; import androidx.test.espresso.ViewAction; import com.google.android.material.appbar.CollapsingToolbarLayout; diff --git a/tests/javatests/com/google/android/material/testutils/TestUtilsMatchers.java b/tests/javatests/com/google/android/material/testutils/TestUtilsMatchers.java index 9e001924a8d..38882729eb7 100644 --- a/tests/javatests/com/google/android/material/testutils/TestUtilsMatchers.java +++ b/tests/javatests/com/google/android/material/testutils/TestUtilsMatchers.java @@ -24,7 +24,6 @@ import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; -import androidx.core.widget.TextViewCompat; import androidx.appcompat.view.menu.MenuItemImpl; import android.view.Gravity; import android.view.Menu; @@ -38,6 +37,7 @@ import androidx.annotation.NonNull; import androidx.core.view.GravityCompat; import androidx.core.view.ViewCompat; +import androidx.core.widget.TextViewCompat; import androidx.test.espresso.matcher.BoundedMatcher; import com.google.android.material.expandable.ExpandableWidget; import com.google.android.material.floatingactionbutton.FloatingActionButton; diff --git a/tests/javatests/com/google/android/material/textfield/TextInputLayoutIconsTest.java b/tests/javatests/com/google/android/material/textfield/TextInputLayoutIconsTest.java index f07889a7d32..4e97c61168e 100644 --- a/tests/javatests/com/google/android/material/textfield/TextInputLayoutIconsTest.java +++ b/tests/javatests/com/google/android/material/textfield/TextInputLayoutIconsTest.java @@ -69,12 +69,12 @@ import android.graphics.PorterDuff; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.core.graphics.drawable.TintAwareDrawable; import android.text.method.PasswordTransformationMethod; import android.text.method.TransformationMethod; import android.view.KeyEvent; import android.widget.EditText; import androidx.annotation.Nullable; +import androidx.core.graphics.drawable.TintAwareDrawable; import androidx.test.espresso.ViewAssertion; import androidx.test.espresso.matcher.ViewMatchers.Visibility; import androidx.test.filters.LargeTest; diff --git a/tests/javatests/com/google/android/material/textfield/TextInputLayoutTest.java b/tests/javatests/com/google/android/material/textfield/TextInputLayoutTest.java index 4ef2ff2f052..41dafd3daf9 100644 --- a/tests/javatests/com/google/android/material/textfield/TextInputLayoutTest.java +++ b/tests/javatests/com/google/android/material/textfield/TextInputLayoutTest.java @@ -65,7 +65,6 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Parcelable; -import androidx.core.widget.TextViewCompat; import android.text.TextPaint; import android.util.AttributeSet; import android.util.SparseArray; @@ -74,6 +73,7 @@ import android.widget.TextView; import androidx.annotation.ColorInt; import androidx.core.view.ViewCompat; +import androidx.core.widget.TextViewCompat; import androidx.test.annotation.UiThreadTest; import androidx.test.espresso.ViewAssertion; import androidx.test.filters.MediumTest;