Fix imports for compat code.
A follow up after factor to make it so androidx imports go in the
correct order.
Test: ./gradlew buildOnServer
Change-Id: I40987329adbe8ade68beef6bdc83ae890311b4b8
diff --git a/compat/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java b/compat/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java
index 5f9ce85..e480297 100644
--- a/compat/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java
+++ b/compat/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java
@@ -19,6 +19,7 @@
import android.app.Activity;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
+
import org.junit.Rule;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/android/support/v4/testutils/LayoutDirectionActions.java b/compat/src/androidTest/java/android/support/v4/testutils/LayoutDirectionActions.java
index cba4a59..e71d9ba 100755
--- a/compat/src/androidTest/java/android/support/v4/testutils/LayoutDirectionActions.java
+++ b/compat/src/androidTest/java/android/support/v4/testutils/LayoutDirectionActions.java
@@ -16,13 +16,15 @@
package android.support.v4.testutils;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+
import android.support.test.espresso.UiController;
import android.support.test.espresso.ViewAction;
-import androidx.core.view.ViewCompat;
import android.view.View;
-import org.hamcrest.Matcher;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import androidx.core.view.ViewCompat;
+
+import org.hamcrest.Matcher;
public class LayoutDirectionActions {
/**
diff --git a/compat/src/androidTest/java/android/support/v4/testutils/TestUtils.java b/compat/src/androidTest/java/android/support/v4/testutils/TestUtils.java
index a6e08de..1b3a83a 100644
--- a/compat/src/androidTest/java/android/support/v4/testutils/TestUtils.java
+++ b/compat/src/androidTest/java/android/support/v4/testutils/TestUtils.java
@@ -25,6 +25,7 @@
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
+
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
diff --git a/compat/src/androidTest/java/android/support/v4/testutils/TextViewActions.java b/compat/src/androidTest/java/android/support/v4/testutils/TextViewActions.java
index 1be3527..feec51f 100644
--- a/compat/src/androidTest/java/android/support/v4/testutils/TextViewActions.java
+++ b/compat/src/androidTest/java/android/support/v4/testutils/TextViewActions.java
@@ -16,19 +16,21 @@
package android.support.v4.testutils;
+import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+
import android.graphics.drawable.Drawable;
+import android.support.test.espresso.UiController;
+import android.support.test.espresso.ViewAction;
+import android.view.View;
+import android.widget.TextView;
+
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.annotation.StyleRes;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
import androidx.core.widget.TextViewCompat;
-import android.view.View;
-import android.widget.TextView;
-import org.hamcrest.Matcher;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import org.hamcrest.Matcher;
public class TextViewActions {
/**
diff --git a/compat/src/androidTest/java/androidx/core/app/ActivityCompatTest.java b/compat/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
index c9966ca..82c9e27 100644
--- a/compat/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
@@ -26,13 +26,14 @@
import android.Manifest;
import android.app.Activity;
-import androidx.core.test.R;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
-import androidx.core.app.ActivityCompat.PermissionCompatDelegate;
import android.view.View;
+import androidx.core.app.ActivityCompat.PermissionCompatDelegate;
+import androidx.core.test.R;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java b/compat/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java
index 0ea5426..6f33d09 100644
--- a/compat/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java
@@ -27,13 +27,14 @@
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java b/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
index d02557b..92343ea 100644
--- a/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
@@ -16,13 +16,6 @@
package androidx.core.app;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
import static androidx.core.app.NotificationCompat.DEFAULT_ALL;
import static androidx.core.app.NotificationCompat.DEFAULT_LIGHTS;
import static androidx.core.app.NotificationCompat.DEFAULT_SOUND;
@@ -31,6 +24,13 @@
import static androidx.core.app.NotificationCompat.GROUP_ALERT_CHILDREN;
import static androidx.core.app.NotificationCompat.GROUP_ALERT_SUMMARY;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
import android.app.Notification;
import android.content.Context;
import android.graphics.Color;
diff --git a/compat/src/androidTest/java/androidx/core/app/TestSupportActivity.java b/compat/src/androidTest/java/androidx/core/app/TestSupportActivity.java
index 3673ba6..88b7989 100644
--- a/compat/src/androidTest/java/androidx/core/app/TestSupportActivity.java
+++ b/compat/src/androidTest/java/androidx/core/app/TestSupportActivity.java
@@ -17,9 +17,10 @@
package androidx.core.app;
import android.os.Bundle;
-import androidx.core.test.R;
import android.view.WindowManager;
+import androidx.core.test.R;
+
public class TestSupportActivity extends SupportActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/compat/src/androidTest/java/androidx/core/content/ContextCompatTest.java b/compat/src/androidTest/java/androidx/core/content/ContextCompatTest.java
index 71582bf..1c486c4 100644
--- a/compat/src/androidTest/java/androidx/core/content/ContextCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/ContextCompatTest.java
@@ -28,7 +28,6 @@
import android.content.res.ColorStateList;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import androidx.core.test.R;
import android.support.test.filters.SdkSuppress;
import android.support.test.filters.SmallTest;
import android.support.v4.BaseInstrumentationTestCase;
@@ -37,6 +36,8 @@
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
+import androidx.core.test.R;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/FileProviderTest.java b/compat/src/androidTest/java/androidx/core/content/FileProviderTest.java
index 6e1fbeb..4872cf5 100644
--- a/compat/src/androidTest/java/androidx/core/content/FileProviderTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/FileProviderTest.java
@@ -32,6 +32,7 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+
import androidx.core.content.FileProvider.SimplePathStrategy;
import org.junit.Before;
diff --git a/compat/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java b/compat/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java
index 815bdcc..d878eb5 100644
--- a/compat/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java
@@ -31,13 +31,14 @@
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
-import androidx.core.test.R;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+
import androidx.core.app.TestSupportActivity;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.IconCompat;
+import androidx.core.test.R;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java b/compat/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java
index 56418e7..b12ce39 100644
--- a/compat/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java
@@ -50,6 +50,7 @@
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
+
import androidx.core.app.TestSupportActivity;
import androidx.core.graphics.drawable.IconCompat;
diff --git a/compat/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java b/compat/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java
index d20ff38..b3982f1 100644
--- a/compat/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java
@@ -29,13 +29,14 @@
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
import android.os.Build;
-import androidx.core.test.R;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
-import androidx.core.provider.FontRequest;
import android.util.Base64;
+import androidx.core.provider.FontRequest;
+import androidx.core.test.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java b/compat/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java
index 96103b7..90510c2 100644
--- a/compat/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java
@@ -28,15 +28,16 @@
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.core.test.R;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
-import androidx.core.provider.FontsContractCompat;
-import androidx.core.provider.MockFontProvider;
import android.support.v4.testutils.TestUtils;
import android.util.DisplayMetrics;
+import androidx.annotation.NonNull;
+import androidx.core.provider.FontsContractCompat;
+import androidx.core.provider.MockFontProvider;
+import androidx.core.test.R;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java b/compat/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java
index f6adf01..28050f0 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java
@@ -33,6 +33,7 @@
import android.os.Build;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+
import androidx.core.graphics.drawable.DrawableCompat;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/TestTintAwareDrawable.java b/compat/src/androidTest/java/androidx/core/graphics/TestTintAwareDrawable.java
index cf26505..4390f74 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/TestTintAwareDrawable.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/TestTintAwareDrawable.java
@@ -19,6 +19,7 @@
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.drawable.BitmapDrawable;
+
import androidx.core.graphics.drawable.TintAwareDrawable;
public class TestTintAwareDrawable extends BitmapDrawable implements TintAwareDrawable {
diff --git a/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java b/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java
index 48151b4..e1a1834 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java
@@ -32,10 +32,10 @@
import android.graphics.Paint;
import android.graphics.Typeface;
import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.core.test.R;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
+
+import androidx.annotation.NonNull;
import androidx.core.content.res.FontResourcesParserCompat;
import androidx.core.content.res.FontResourcesParserCompat.FamilyResourceEntry;
import androidx.core.content.res.FontResourcesParserCompat.ProviderResourceEntry;
@@ -43,6 +43,7 @@
import androidx.core.provider.FontRequest;
import androidx.core.provider.FontsContractCompat;
import androidx.core.provider.MockFontProvider;
+import androidx.core.test.R;
import org.junit.After;
import org.junit.Before;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java b/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java
index 668b1d6..cd2932b 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java
@@ -21,9 +21,10 @@
import android.content.Context;
import android.net.Uri;
import android.os.Build;
-import androidx.annotation.RequiresApi;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
+
+import androidx.annotation.RequiresApi;
import androidx.core.provider.MockFontProvider;
import org.junit.Before;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java b/compat/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java
index 3de2c0a..219737b 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java
@@ -31,12 +31,13 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import androidx.core.test.R;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SdkSuppress;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+
import androidx.core.content.ContextCompat;
+import androidx.core.test.R;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java b/compat/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java
index bcb42ae..23149df 100644
--- a/compat/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java
@@ -40,14 +40,15 @@
import android.content.pm.ProviderInfo;
import android.content.pm.Signature;
import android.graphics.Typeface;
-import androidx.annotation.NonNull;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+import android.util.Base64;
+
+import androidx.annotation.NonNull;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.provider.FontsContractCompat.FontFamilyResult;
import androidx.core.provider.FontsContractCompat.FontInfo;
-import android.util.Base64;
import org.junit.After;
import org.junit.Before;
diff --git a/compat/src/androidTest/java/androidx/core/provider/MockFontProvider.java b/compat/src/androidTest/java/androidx/core/provider/MockFontProvider.java
index 0a750ba..ed5f916 100644
--- a/compat/src/androidTest/java/androidx/core/provider/MockFontProvider.java
+++ b/compat/src/androidTest/java/androidx/core/provider/MockFontProvider.java
@@ -25,6 +25,7 @@
import android.database.MatrixCursor;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
+
import androidx.core.provider.FontsContractCompat.Columns;
import java.io.File;
diff --git a/compat/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java b/compat/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java
index fa8d179..d193fc9 100644
--- a/compat/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java
+++ b/compat/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java
@@ -25,12 +25,13 @@
import static org.junit.Assert.fail;
import android.os.Process;
-import androidx.annotation.GuardedBy;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.GuardedBy;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java b/compat/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java
index 41b4585..8435df1 100644
--- a/compat/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java
@@ -24,7 +24,6 @@
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
-import androidx.core.util.PatternsCompat;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.URLSpan;
@@ -32,6 +31,8 @@
import android.text.util.Linkify.MatchFilter;
import android.text.util.Linkify.TransformFilter;
+import androidx.core.util.PatternsCompat;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/view/DragStartHelperTest.java b/compat/src/androidTest/java/androidx/core/view/DragStartHelperTest.java
index 71c8c0f..268eead 100644
--- a/compat/src/androidTest/java/androidx/core/view/DragStartHelperTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/DragStartHelperTest.java
@@ -30,20 +30,21 @@
import android.graphics.Point;
import android.os.Build;
import android.os.SystemClock;
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
import android.support.test.filters.SdkSuppress;
import android.support.test.filters.SmallTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import androidx.core.test.R;
import android.view.InputDevice;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewConfiguration;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.core.test.R;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/view/DragStartHelperTestActivity.java b/compat/src/androidTest/java/androidx/core/view/DragStartHelperTestActivity.java
index 088ba28..0c6b27c 100644
--- a/compat/src/androidTest/java/androidx/core/view/DragStartHelperTestActivity.java
+++ b/compat/src/androidTest/java/androidx/core/view/DragStartHelperTestActivity.java
@@ -18,6 +18,7 @@
import android.app.Activity;
import android.os.Bundle;
+
import androidx.core.test.R;
public class DragStartHelperTestActivity extends Activity {
diff --git a/compat/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java b/compat/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java
index 13429ea..5aac25e 100644
--- a/compat/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java
@@ -22,7 +22,6 @@
import android.app.Activity;
import android.graphics.Bitmap;
import android.os.Build;
-import androidx.core.test.R;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SdkSuppress;
import android.support.test.filters.SmallTest;
@@ -31,6 +30,8 @@
import android.view.PointerIcon;
import android.view.View;
+import androidx.core.test.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/view/ViewCompatActivity.java b/compat/src/androidTest/java/androidx/core/view/ViewCompatActivity.java
index cb0f19e..36857bd 100644
--- a/compat/src/androidTest/java/androidx/core/view/ViewCompatActivity.java
+++ b/compat/src/androidTest/java/androidx/core/view/ViewCompatActivity.java
@@ -16,9 +16,10 @@
package androidx.core.view;
-import androidx.core.test.R;
import android.support.v4.BaseTestActivity;
+import androidx.core.test.R;
+
public class ViewCompatActivity extends BaseTestActivity {
@Override
diff --git a/compat/src/androidTest/java/androidx/core/view/ViewCompatTest.java b/compat/src/androidTest/java/androidx/core/view/ViewCompatTest.java
index d5c3c37..0c94522 100644
--- a/compat/src/androidTest/java/androidx/core/view/ViewCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/ViewCompatTest.java
@@ -24,13 +24,14 @@
import static org.junit.Assert.assertTrue;
import android.app.Activity;
-import androidx.core.test.R;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.Display;
import android.view.View;
+import androidx.core.test.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java b/compat/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java
index 0db62d7..08263f3 100644
--- a/compat/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java
@@ -22,13 +22,14 @@
import android.app.Activity;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
-import androidx.core.test.R;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.ViewGroup;
+import androidx.core.test.R;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/view/ViewPropertyAnimatorCompatTest.java b/compat/src/androidTest/java/androidx/core/view/ViewPropertyAnimatorCompatTest.java
index 1b0f57d..e1fc717 100644
--- a/compat/src/androidTest/java/androidx/core/view/ViewPropertyAnimatorCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/ViewPropertyAnimatorCompatTest.java
@@ -19,11 +19,12 @@
import static org.junit.Assert.assertTrue;
import android.app.Activity;
-import androidx.core.test.R;
import android.support.test.filters.MediumTest;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.View;
+import androidx.core.test.R;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/view/VpaActivity.java b/compat/src/androidTest/java/androidx/core/view/VpaActivity.java
index 3222b6e..a1f422c 100644
--- a/compat/src/androidTest/java/androidx/core/view/VpaActivity.java
+++ b/compat/src/androidTest/java/androidx/core/view/VpaActivity.java
@@ -16,9 +16,10 @@
package androidx.core.view;
-import androidx.core.test.R;
import android.support.v4.BaseTestActivity;
+import androidx.core.test.R;
+
public class VpaActivity extends BaseTestActivity {
@Override
protected int getContentViewLayoutResId() {
diff --git a/compat/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java b/compat/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
index d6865ce..7b862c2 100644
--- a/compat/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
@@ -20,6 +20,7 @@
import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertThat;
import static org.junit.Assume.assumeTrue;
+
import android.os.Build;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
diff --git a/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarActivity.java b/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarActivity.java
index 3b92002..dc5055b 100644
--- a/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarActivity.java
+++ b/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarActivity.java
@@ -18,6 +18,7 @@
import android.app.Activity;
import android.os.Bundle;
+
import androidx.core.test.R;
public class ContentLoadingProgressBarActivity extends Activity {
diff --git a/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java b/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java
index 55c51fa..e2f8f8c 100644
--- a/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java
+++ b/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java
@@ -18,19 +18,19 @@
import static org.junit.Assert.assertEquals;
-import androidx.core.test.R;
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.view.View;
+import androidx.core.test.R;
+import androidx.testutils.PollingCheck;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import androidx.testutils.PollingCheck;
-
/**
* Tests for {@link ContentLoadingProgressBar}
*/
diff --git a/compat/src/androidTest/java/androidx/core/widget/ListViewCompatTest.java b/compat/src/androidTest/java/androidx/core/widget/ListViewCompatTest.java
index fd79199..835fe6c 100644
--- a/compat/src/androidTest/java/androidx/core/widget/ListViewCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/widget/ListViewCompatTest.java
@@ -21,9 +21,6 @@
import static org.junit.Assert.assertTrue;
import android.annotation.SuppressLint;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.test.R;
import android.support.test.filters.SmallTest;
import android.support.test.rule.ActivityTestRule;
import android.support.v4.BaseInstrumentationTestCase;
@@ -35,6 +32,10 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.test.R;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/widget/ListViewTestActivity.java b/compat/src/androidTest/java/androidx/core/widget/ListViewTestActivity.java
index fe7bace..6b82448 100644
--- a/compat/src/androidTest/java/androidx/core/widget/ListViewTestActivity.java
+++ b/compat/src/androidTest/java/androidx/core/widget/ListViewTestActivity.java
@@ -16,9 +16,10 @@
package androidx.core.widget;
-import androidx.core.test.R;
import android.support.v4.BaseTestActivity;
+import androidx.core.test.R;
+
public class ListViewTestActivity extends BaseTestActivity {
@Override
protected int getContentViewLayoutResId() {
diff --git a/compat/src/androidTest/java/androidx/core/widget/TextViewCompatTest.java b/compat/src/androidTest/java/androidx/core/widget/TextViewCompatTest.java
index 7b1fbe6..0edddd4 100644
--- a/compat/src/androidTest/java/androidx/core/widget/TextViewCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/widget/TextViewCompatTest.java
@@ -45,20 +45,21 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Looper;
-import androidx.annotation.ColorInt;
-import androidx.core.test.R;
import android.support.test.filters.SdkSuppress;
import android.support.test.filters.SmallTest;
import android.support.v4.BaseInstrumentationTestCase;
import android.support.v4.testutils.TestUtils;
-import androidx.core.view.ViewCompat;
-import androidx.appcompat.view.menu.MenuBuilder;
import android.view.ActionMode;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
+import androidx.annotation.ColorInt;
+import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.core.test.R;
+import androidx.core.view.ViewCompat;
+
import org.junit.Before;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
diff --git a/compat/src/androidTest/java/androidx/core/widget/TextViewTestActivity.java b/compat/src/androidTest/java/androidx/core/widget/TextViewTestActivity.java
index a0a2367..9fa4689 100644
--- a/compat/src/androidTest/java/androidx/core/widget/TextViewTestActivity.java
+++ b/compat/src/androidTest/java/androidx/core/widget/TextViewTestActivity.java
@@ -16,9 +16,10 @@
package androidx.core.widget;
-import androidx.core.test.R;
import android.support.v4.BaseTestActivity;
+import androidx.core.test.R;
+
public class TextViewTestActivity extends BaseTestActivity {
@Override
protected int getContentViewLayoutResId() {
diff --git a/compat/src/main/java/android/support/v4/os/ResultReceiver.java b/compat/src/main/java/android/support/v4/os/ResultReceiver.java
index c26c7b7..4c08e1e 100644
--- a/compat/src/main/java/android/support/v4/os/ResultReceiver.java
+++ b/compat/src/main/java/android/support/v4/os/ResultReceiver.java
@@ -23,6 +23,7 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.os.RemoteException;
+
import androidx.annotation.RestrictTo;
/**
diff --git a/compat/src/main/java/androidx/core/accessibilityservice/AccessibilityServiceInfoCompat.java b/compat/src/main/java/androidx/core/accessibilityservice/AccessibilityServiceInfoCompat.java
index ae303f7..a8214fd 100644
--- a/compat/src/main/java/androidx/core/accessibilityservice/AccessibilityServiceInfoCompat.java
+++ b/compat/src/main/java/androidx/core/accessibilityservice/AccessibilityServiceInfoCompat.java
@@ -20,9 +20,10 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.content.pm.PackageManager;
import android.os.Build;
+import android.view.View;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.view.View;
/**
* Helper for accessing features in {@link AccessibilityServiceInfo}.
diff --git a/compat/src/main/java/androidx/core/app/ActivityCompat.java b/compat/src/main/java/androidx/core/app/ActivityCompat.java
index 84ab1e9..9d9b9bc 100644
--- a/compat/src/main/java/androidx/core/app/ActivityCompat.java
+++ b/compat/src/main/java/androidx/core/app/ActivityCompat.java
@@ -29,16 +29,17 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Parcelable;
+import android.view.DragEvent;
+import android.view.View;
+
import androidx.annotation.IdRes;
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
-import androidx.core.view.DragAndDropPermissionsCompat;
import androidx.core.content.ContextCompat;
-import android.view.DragEvent;
-import android.view.View;
+import androidx.core.view.DragAndDropPermissionsCompat;
import java.util.List;
import java.util.Map;
diff --git a/compat/src/main/java/androidx/core/app/ActivityManagerCompat.java b/compat/src/main/java/androidx/core/app/ActivityManagerCompat.java
index 4f1c7b5..2e5abb5 100644
--- a/compat/src/main/java/androidx/core/app/ActivityManagerCompat.java
+++ b/compat/src/main/java/androidx/core/app/ActivityManagerCompat.java
@@ -18,6 +18,7 @@
import android.app.ActivityManager;
import android.os.Build;
+
import androidx.annotation.NonNull;
/**
diff --git a/compat/src/main/java/androidx/core/app/ActivityOptionsCompat.java b/compat/src/main/java/androidx/core/app/ActivityOptionsCompat.java
index 43809c0..3f2c8ab 100644
--- a/compat/src/main/java/androidx/core/app/ActivityOptionsCompat.java
+++ b/compat/src/main/java/androidx/core/app/ActivityOptionsCompat.java
@@ -24,11 +24,12 @@
import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
+import android.view.View;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.util.Pair;
-import android.view.View;
/**
* Helper for accessing features in {@link android.app.ActivityOptions} in a backwards compatible
diff --git a/compat/src/main/java/androidx/core/app/AlarmManagerCompat.java b/compat/src/main/java/androidx/core/app/AlarmManagerCompat.java
index 07a03d8..f1421fd 100644
--- a/compat/src/main/java/androidx/core/app/AlarmManagerCompat.java
+++ b/compat/src/main/java/androidx/core/app/AlarmManagerCompat.java
@@ -19,6 +19,7 @@
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.os.Build;
+
import androidx.annotation.NonNull;
/**
diff --git a/compat/src/main/java/androidx/core/app/AppLaunchChecker.java b/compat/src/main/java/androidx/core/app/AppLaunchChecker.java
index aedde9d..8b8d308 100644
--- a/compat/src/main/java/androidx/core/app/AppLaunchChecker.java
+++ b/compat/src/main/java/androidx/core/app/AppLaunchChecker.java
@@ -22,6 +22,7 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
+
import androidx.annotation.NonNull;
import androidx.core.content.IntentCompat;
diff --git a/compat/src/main/java/androidx/core/app/AppOpsManagerCompat.java b/compat/src/main/java/androidx/core/app/AppOpsManagerCompat.java
index 8ed790c..689d943 100644
--- a/compat/src/main/java/androidx/core/app/AppOpsManagerCompat.java
+++ b/compat/src/main/java/androidx/core/app/AppOpsManagerCompat.java
@@ -20,6 +20,7 @@
import android.app.AppOpsManager;
import android.content.Context;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/compat/src/main/java/androidx/core/app/BundleCompat.java b/compat/src/main/java/androidx/core/app/BundleCompat.java
index 64474a8..c1bb802 100644
--- a/compat/src/main/java/androidx/core/app/BundleCompat.java
+++ b/compat/src/main/java/androidx/core/app/BundleCompat.java
@@ -19,9 +19,10 @@
import android.os.Build;
import android.os.Bundle;
import android.os.IBinder;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.util.Log;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/compat/src/main/java/androidx/core/app/FrameMetricsAggregator.java b/compat/src/main/java/androidx/core/app/FrameMetricsAggregator.java
index b8474c5..3598684 100644
--- a/compat/src/main/java/androidx/core/app/FrameMetricsAggregator.java
+++ b/compat/src/main/java/androidx/core/app/FrameMetricsAggregator.java
@@ -23,13 +23,14 @@
import android.os.Build;
import android.os.Handler;
import android.os.HandlerThread;
+import android.util.SparseIntArray;
+import android.view.Window;
+
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
-import android.util.SparseIntArray;
-import android.view.Window;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/compat/src/main/java/androidx/core/app/JobIntentService.java b/compat/src/main/java/androidx/core/app/JobIntentService.java
index fccbd0d..3e1532d 100644
--- a/compat/src/main/java/androidx/core/app/JobIntentService.java
+++ b/compat/src/main/java/androidx/core/app/JobIntentService.java
@@ -29,10 +29,11 @@
import android.os.Build;
import android.os.IBinder;
import android.os.PowerManager;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
-import android.util.Log;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/compat/src/main/java/androidx/core/app/NavUtils.java b/compat/src/main/java/androidx/core/app/NavUtils.java
index f8d6254..fb47cb2 100644
--- a/compat/src/main/java/androidx/core/app/NavUtils.java
+++ b/compat/src/main/java/androidx/core/app/NavUtils.java
@@ -24,9 +24,10 @@
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.util.Log;
/**
* NavUtils provides helper functionality for applications implementing
diff --git a/compat/src/main/java/androidx/core/app/NotificationBuilderWithBuilderAccessor.java b/compat/src/main/java/androidx/core/app/NotificationBuilderWithBuilderAccessor.java
index 85db338..f779eb2 100644
--- a/compat/src/main/java/androidx/core/app/NotificationBuilderWithBuilderAccessor.java
+++ b/compat/src/main/java/androidx/core/app/NotificationBuilderWithBuilderAccessor.java
@@ -19,6 +19,7 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.app.Notification;
+
import androidx.annotation.RestrictTo;
/**
diff --git a/compat/src/main/java/androidx/core/app/NotificationCompat.java b/compat/src/main/java/androidx/core/app/NotificationCompat.java
index c105b10..020d558 100644
--- a/compat/src/main/java/androidx/core/app/NotificationCompat.java
+++ b/compat/src/main/java/androidx/core/app/NotificationCompat.java
@@ -39,15 +39,6 @@
import android.os.Bundle;
import android.os.Parcelable;
import android.os.SystemClock;
-import androidx.annotation.ColorInt;
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.RestrictTo;
-import androidx.core.R;
-import androidx.core.text.BidiFormatter;
-import androidx.core.view.GravityCompat;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
@@ -58,6 +49,16 @@
import android.view.View;
import android.widget.RemoteViews;
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.core.R;
+import androidx.core.text.BidiFormatter;
+import androidx.core.view.GravityCompat;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.text.NumberFormat;
diff --git a/compat/src/main/java/androidx/core/app/NotificationCompatBuilder.java b/compat/src/main/java/androidx/core/app/NotificationCompatBuilder.java
index 625f73a..6be24ff 100644
--- a/compat/src/main/java/androidx/core/app/NotificationCompatBuilder.java
+++ b/compat/src/main/java/androidx/core/app/NotificationCompatBuilder.java
@@ -27,11 +27,12 @@
import android.app.Notification;
import android.os.Build;
import android.os.Bundle;
-import androidx.annotation.RestrictTo;
import android.text.TextUtils;
import android.util.SparseArray;
import android.widget.RemoteViews;
+import androidx.annotation.RestrictTo;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/compat/src/main/java/androidx/core/app/NotificationCompatJellybean.java b/compat/src/main/java/androidx/core/app/NotificationCompatJellybean.java
index c7b0160..3157aad 100644
--- a/compat/src/main/java/androidx/core/app/NotificationCompatJellybean.java
+++ b/compat/src/main/java/androidx/core/app/NotificationCompatJellybean.java
@@ -23,6 +23,8 @@
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.RequiresApi;
+
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,8 +32,6 @@
import java.util.List;
import java.util.Set;
-import androidx.annotation.RequiresApi;
-
@RequiresApi(16)
class NotificationCompatJellybean {
public static final String TAG = "NotificationCompat";
diff --git a/compat/src/main/java/androidx/core/app/NotificationManagerCompat.java b/compat/src/main/java/androidx/core/app/NotificationManagerCompat.java
index b1599ae..3660de3 100644
--- a/compat/src/main/java/androidx/core/app/NotificationManagerCompat.java
+++ b/compat/src/main/java/androidx/core/app/NotificationManagerCompat.java
@@ -35,11 +35,12 @@
import android.os.Message;
import android.os.RemoteException;
import android.provider.Settings;
+import android.support.v4.app.INotificationSideChannel;
+import android.util.Log;
+
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.support.v4.app.INotificationSideChannel;
-import android.util.Log;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
diff --git a/compat/src/main/java/androidx/core/app/RemoteInput.java b/compat/src/main/java/androidx/core/app/RemoteInput.java
index 54b16f2..db33472 100644
--- a/compat/src/main/java/androidx/core/app/RemoteInput.java
+++ b/compat/src/main/java/androidx/core/app/RemoteInput.java
@@ -22,9 +22,10 @@
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
-import androidx.annotation.RequiresApi;
import android.util.Log;
+import androidx.annotation.RequiresApi;
+
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
diff --git a/compat/src/main/java/androidx/core/app/ServiceCompat.java b/compat/src/main/java/androidx/core/app/ServiceCompat.java
index 9ec85da..65a4c0e 100644
--- a/compat/src/main/java/androidx/core/app/ServiceCompat.java
+++ b/compat/src/main/java/androidx/core/app/ServiceCompat.java
@@ -21,6 +21,7 @@
import android.app.Notification;
import android.app.Service;
import android.os.Build;
+
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.RestrictTo;
diff --git a/compat/src/main/java/androidx/core/app/ShareCompat.java b/compat/src/main/java/androidx/core/app/ShareCompat.java
index f5ca5f6..ca00451 100644
--- a/compat/src/main/java/androidx/core/app/ShareCompat.java
+++ b/compat/src/main/java/androidx/core/app/ShareCompat.java
@@ -25,8 +25,6 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import androidx.annotation.StringRes;
-import androidx.core.content.IntentCompat;
import android.text.Html;
import android.text.Spanned;
import android.util.Log;
@@ -35,6 +33,9 @@
import android.view.MenuItem;
import android.widget.ShareActionProvider;
+import androidx.annotation.StringRes;
+import androidx.core.content.IntentCompat;
+
import java.util.ArrayList;
/**
diff --git a/compat/src/main/java/androidx/core/app/SupportActivity.java b/compat/src/main/java/androidx/core/app/SupportActivity.java
index a62b9a5..5ec33ec 100644
--- a/compat/src/main/java/androidx/core/app/SupportActivity.java
+++ b/compat/src/main/java/androidx/core/app/SupportActivity.java
@@ -24,6 +24,7 @@
import android.arch.lifecycle.LifecycleRegistry;
import android.arch.lifecycle.ReportFragment;
import android.os.Bundle;
+
import androidx.annotation.CallSuper;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
diff --git a/compat/src/main/java/androidx/core/app/TaskStackBuilder.java b/compat/src/main/java/androidx/core/app/TaskStackBuilder.java
index 859750f..c3deff6 100644
--- a/compat/src/main/java/androidx/core/app/TaskStackBuilder.java
+++ b/compat/src/main/java/androidx/core/app/TaskStackBuilder.java
@@ -24,11 +24,12 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build;
import android.os.Bundle;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
-import android.util.Log;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/compat/src/main/java/androidx/core/content/ContentResolverCompat.java b/compat/src/main/java/androidx/core/content/ContentResolverCompat.java
index 188bb1f..2e276b9 100644
--- a/compat/src/main/java/androidx/core/content/ContentResolverCompat.java
+++ b/compat/src/main/java/androidx/core/content/ContentResolverCompat.java
@@ -21,6 +21,7 @@
import android.content.ContentResolver;
import android.database.Cursor;
import android.net.Uri;
+
import androidx.core.os.CancellationSignal;
import androidx.core.os.OperationCanceledException;
diff --git a/compat/src/main/java/androidx/core/content/ContextCompat.java b/compat/src/main/java/androidx/core/content/ContextCompat.java
index 9cf4d35..c3a9e21 100644
--- a/compat/src/main/java/androidx/core/content/ContextCompat.java
+++ b/compat/src/main/java/androidx/core/content/ContextCompat.java
@@ -119,13 +119,6 @@
import android.os.Vibrator;
import android.os.storage.StorageManager;
import android.print.PrintManager;
-import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.os.EnvironmentCompat;
import android.telecom.TelecomManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
@@ -137,6 +130,14 @@
import android.view.inputmethod.InputMethodManager;
import android.view.textservice.TextServicesManager;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.os.EnvironmentCompat;
+
import java.io.File;
import java.util.HashMap;
diff --git a/compat/src/main/java/androidx/core/content/FileProvider.java b/compat/src/main/java/androidx/core/content/FileProvider.java
index ffbac3b..fd0e04d 100644
--- a/compat/src/main/java/androidx/core/content/FileProvider.java
+++ b/compat/src/main/java/androidx/core/content/FileProvider.java
@@ -33,11 +33,12 @@
import android.os.Environment;
import android.os.ParcelFileDescriptor;
import android.provider.OpenableColumns;
+import android.text.TextUtils;
+import android.webkit.MimeTypeMap;
+
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.text.TextUtils;
-import android.webkit.MimeTypeMap;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/compat/src/main/java/androidx/core/content/IntentCompat.java b/compat/src/main/java/androidx/core/content/IntentCompat.java
index 82419ba..1909ac8 100644
--- a/compat/src/main/java/androidx/core/content/IntentCompat.java
+++ b/compat/src/main/java/androidx/core/content/IntentCompat.java
@@ -18,6 +18,7 @@
import android.content.Intent;
import android.os.Build;
+
import androidx.annotation.NonNull;
/**
diff --git a/compat/src/main/java/androidx/core/content/PermissionChecker.java b/compat/src/main/java/androidx/core/content/PermissionChecker.java
index 063133f..62dae8c 100644
--- a/compat/src/main/java/androidx/core/content/PermissionChecker.java
+++ b/compat/src/main/java/androidx/core/content/PermissionChecker.java
@@ -22,6 +22,7 @@
import android.content.pm.PackageManager;
import android.os.Binder;
import android.os.Process;
+
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/compat/src/main/java/androidx/core/content/SharedPreferencesCompat.java b/compat/src/main/java/androidx/core/content/SharedPreferencesCompat.java
index 8fd3bb0..d780f6f 100644
--- a/compat/src/main/java/androidx/core/content/SharedPreferencesCompat.java
+++ b/compat/src/main/java/androidx/core/content/SharedPreferencesCompat.java
@@ -17,6 +17,7 @@
package androidx.core.content;
import android.content.SharedPreferences;
+
import androidx.annotation.NonNull;
/**
diff --git a/compat/src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java b/compat/src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java
index 154e7a1..5c3a8b8 100644
--- a/compat/src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java
+++ b/compat/src/main/java/androidx/core/content/pm/ShortcutInfoCompat.java
@@ -21,12 +21,13 @@
import android.content.pm.PackageManager;
import android.content.pm.ShortcutInfo;
import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.VisibleForTesting;
import androidx.core.graphics.drawable.IconCompat;
-import android.text.TextUtils;
import java.util.Arrays;
diff --git a/compat/src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java b/compat/src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java
index d1ae964..7f17f32 100644
--- a/compat/src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java
+++ b/compat/src/main/java/androidx/core/content/pm/ShortcutManagerCompat.java
@@ -25,11 +25,12 @@
import android.content.pm.ResolveInfo;
import android.content.pm.ShortcutManager;
import android.os.Build;
+import android.text.TextUtils;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.ContextCompat;
-import android.text.TextUtils;
/**
* Helper for accessing features in {@link android.content.pm.ShortcutManager}.
diff --git a/compat/src/main/java/androidx/core/content/res/ConfigurationHelper.java b/compat/src/main/java/androidx/core/content/res/ConfigurationHelper.java
index 47e0c59..ca5094d 100644
--- a/compat/src/main/java/androidx/core/content/res/ConfigurationHelper.java
+++ b/compat/src/main/java/androidx/core/content/res/ConfigurationHelper.java
@@ -20,6 +20,7 @@
import android.content.res.Configuration;
import android.content.res.Resources;
+
import androidx.annotation.NonNull;
/**
diff --git a/compat/src/main/java/androidx/core/content/res/FontResourcesParserCompat.java b/compat/src/main/java/androidx/core/content/res/FontResourcesParserCompat.java
index 3b64537..d2f2f22 100644
--- a/compat/src/main/java/androidx/core/content/res/FontResourcesParserCompat.java
+++ b/compat/src/main/java/androidx/core/content/res/FontResourcesParserCompat.java
@@ -20,6 +20,10 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.util.Base64;
+import android.util.Xml;
+
import androidx.annotation.ArrayRes;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
@@ -27,9 +31,6 @@
import androidx.annotation.RestrictTo;
import androidx.core.R;
import androidx.core.provider.FontRequest;
-import android.util.AttributeSet;
-import android.util.Base64;
-import android.util.Xml;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/compat/src/main/java/androidx/core/content/res/ResourcesCompat.java b/compat/src/main/java/androidx/core/content/res/ResourcesCompat.java
index 35b364f..31d4663 100644
--- a/compat/src/main/java/androidx/core/content/res/ResourcesCompat.java
+++ b/compat/src/main/java/androidx/core/content/res/ResourcesCompat.java
@@ -17,6 +17,7 @@
package androidx.core.content.res;
import static android.os.Build.VERSION.SDK_INT;
+
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.content.Context;
@@ -29,6 +30,9 @@
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.os.Looper;
+import android.util.Log;
+import android.util.TypedValue;
+
import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
@@ -41,8 +45,6 @@
import androidx.core.provider.FontsContractCompat.FontRequestCallback;
import androidx.core.provider.FontsContractCompat.FontRequestCallback.FontRequestFailReason;
import androidx.core.util.Preconditions;
-import android.util.Log;
-import android.util.TypedValue;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/compat/src/main/java/androidx/core/content/res/TypedArrayUtils.java b/compat/src/main/java/androidx/core/content/res/TypedArrayUtils.java
index a861167..2aa8449 100644
--- a/compat/src/main/java/androidx/core/content/res/TypedArrayUtils.java
+++ b/compat/src/main/java/androidx/core/content/res/TypedArrayUtils.java
@@ -21,14 +21,15 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+
import androidx.annotation.AnyRes;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.annotation.StyleableRes;
-import android.util.AttributeSet;
-import android.util.TypedValue;
import org.xmlpull.v1.XmlPullParser;
diff --git a/compat/src/main/java/androidx/core/graphics/BitmapCompat.java b/compat/src/main/java/androidx/core/graphics/BitmapCompat.java
index 5103b5f..1ef3f5f 100644
--- a/compat/src/main/java/androidx/core/graphics/BitmapCompat.java
+++ b/compat/src/main/java/androidx/core/graphics/BitmapCompat.java
@@ -17,6 +17,7 @@
import android.graphics.Bitmap;
import android.os.Build;
+
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
diff --git a/compat/src/main/java/androidx/core/graphics/ColorUtils.java b/compat/src/main/java/androidx/core/graphics/ColorUtils.java
index df2b706..c36142c 100644
--- a/compat/src/main/java/androidx/core/graphics/ColorUtils.java
+++ b/compat/src/main/java/androidx/core/graphics/ColorUtils.java
@@ -17,6 +17,7 @@
package androidx.core.graphics;
import android.graphics.Color;
+
import androidx.annotation.ColorInt;
import androidx.annotation.FloatRange;
import androidx.annotation.IntRange;
diff --git a/compat/src/main/java/androidx/core/graphics/PaintCompat.java b/compat/src/main/java/androidx/core/graphics/PaintCompat.java
index c5beac7..7caa3e5 100644
--- a/compat/src/main/java/androidx/core/graphics/PaintCompat.java
+++ b/compat/src/main/java/androidx/core/graphics/PaintCompat.java
@@ -19,6 +19,7 @@
import android.graphics.Paint;
import android.graphics.Rect;
import android.os.Build;
+
import androidx.annotation.NonNull;
import androidx.core.util.Pair;
diff --git a/compat/src/main/java/androidx/core/graphics/PathParser.java b/compat/src/main/java/androidx/core/graphics/PathParser.java
index a1a092e..6f9d83d 100644
--- a/compat/src/main/java/androidx/core/graphics/PathParser.java
+++ b/compat/src/main/java/androidx/core/graphics/PathParser.java
@@ -19,9 +19,10 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.graphics.Path;
-import androidx.annotation.RestrictTo;
import android.util.Log;
+import androidx.annotation.RestrictTo;
+
import java.util.ArrayList;
/**
diff --git a/compat/src/main/java/androidx/core/graphics/TypefaceCompat.java b/compat/src/main/java/androidx/core/graphics/TypefaceCompat.java
index 7b04131..042068a 100644
--- a/compat/src/main/java/androidx/core/graphics/TypefaceCompat.java
+++ b/compat/src/main/java/androidx/core/graphics/TypefaceCompat.java
@@ -24,9 +24,11 @@
import android.os.Build;
import android.os.CancellationSignal;
import android.os.Handler;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
+import androidx.collection.LruCache;
import androidx.core.content.res.FontResourcesParserCompat;
import androidx.core.content.res.FontResourcesParserCompat.FamilyResourceEntry;
import androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry;
@@ -35,7 +37,6 @@
import androidx.core.os.BuildCompat;
import androidx.core.provider.FontsContractCompat;
import androidx.core.provider.FontsContractCompat.FontInfo;
-import androidx.collection.LruCache;
/**
* Helper for accessing features in {@link Typeface}.
* @hide
diff --git a/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java b/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java
index 45084bf..ab10ab3 100644
--- a/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java
+++ b/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi21Impl.java
@@ -23,13 +23,14 @@
import android.graphics.Typeface;
import android.os.CancellationSignal;
import android.os.ParcelFileDescriptor;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
+
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
import androidx.core.provider.FontsContractCompat.FontInfo;
-import android.system.ErrnoException;
-import android.system.Os;
-import android.system.OsConstants;
import java.io.File;
import java.io.FileInputStream;
diff --git a/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java b/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java
index 9371408..9d2a520 100644
--- a/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java
+++ b/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi24Impl.java
@@ -23,15 +23,16 @@
import android.graphics.Typeface;
import android.net.Uri;
import android.os.CancellationSignal;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
+import androidx.collection.SimpleArrayMap;
import androidx.core.content.res.FontResourcesParserCompat.FontFamilyFilesResourceEntry;
import androidx.core.content.res.FontResourcesParserCompat.FontFileResourceEntry;
import androidx.core.provider.FontsContractCompat.FontInfo;
-import androidx.collection.SimpleArrayMap;
-import android.util.Log;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
diff --git a/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java b/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java
index 6026afb..9411ade 100644
--- a/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java
+++ b/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi26Impl.java
@@ -27,6 +27,8 @@
import android.net.Uri;
import android.os.CancellationSignal;
import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@@ -34,7 +36,6 @@
import androidx.core.content.res.FontResourcesParserCompat;
import androidx.core.content.res.FontResourcesParserCompat.FontFileResourceEntry;
import androidx.core.provider.FontsContractCompat;
-import android.util.Log;
import java.io.IOException;
import java.lang.reflect.Array;
diff --git a/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi28Impl.java b/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi28Impl.java
index 52cad18..9ff1f41 100644
--- a/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi28Impl.java
+++ b/compat/src/main/java/androidx/core/graphics/TypefaceCompatApi28Impl.java
@@ -19,6 +19,7 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.graphics.Typeface;
+
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
diff --git a/compat/src/main/java/androidx/core/graphics/TypefaceCompatBaseImpl.java b/compat/src/main/java/androidx/core/graphics/TypefaceCompatBaseImpl.java
index 4a03659..3b03cb3 100644
--- a/compat/src/main/java/androidx/core/graphics/TypefaceCompatBaseImpl.java
+++ b/compat/src/main/java/androidx/core/graphics/TypefaceCompatBaseImpl.java
@@ -22,6 +22,7 @@
import android.content.res.Resources;
import android.graphics.Typeface;
import android.os.CancellationSignal;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
diff --git a/compat/src/main/java/androidx/core/graphics/TypefaceCompatUtil.java b/compat/src/main/java/androidx/core/graphics/TypefaceCompatUtil.java
index 1916477..f306f3c 100644
--- a/compat/src/main/java/androidx/core/graphics/TypefaceCompatUtil.java
+++ b/compat/src/main/java/androidx/core/graphics/TypefaceCompatUtil.java
@@ -25,10 +25,11 @@
import android.os.CancellationSignal;
import android.os.ParcelFileDescriptor;
import android.os.Process;
+import android.util.Log;
+
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
-import android.util.Log;
import java.io.Closeable;
import java.io.File;
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/DrawableCompat.java b/compat/src/main/java/androidx/core/graphics/drawable/DrawableCompat.java
index f675d8d..1e0e440 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/DrawableCompat.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/DrawableCompat.java
@@ -24,12 +24,13 @@
import android.graphics.drawable.DrawableContainer;
import android.graphics.drawable.InsetDrawable;
import android.os.Build;
+import android.util.AttributeSet;
+import android.util.Log;
+
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
-import android.util.AttributeSet;
-import android.util.Log;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/IconCompat.java b/compat/src/main/java/androidx/core/graphics/drawable/IconCompat.java
index ae91e87..1089d94 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/IconCompat.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/IconCompat.java
@@ -32,6 +32,7 @@
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.os.Build;
+
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawable.java b/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawable.java
index d9623aa..19ecb5c 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawable.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawable.java
@@ -27,11 +27,12 @@
import android.graphics.RectF;
import android.graphics.Shader;
import android.graphics.drawable.Drawable;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
-import android.util.DisplayMetrics;
-import android.view.Gravity;
/**
* A Drawable that wraps a bitmap and can be drawn with rounded corners. You can create a
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawable21.java b/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawable21.java
index 6da55a6..ea71e88 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawable21.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawable21.java
@@ -20,10 +20,11 @@
import android.graphics.Bitmap;
import android.graphics.Outline;
import android.graphics.Rect;
-import androidx.annotation.RequiresApi;
import android.view.Gravity;
import android.view.View;
+import androidx.annotation.RequiresApi;
+
@RequiresApi(21)
class RoundedBitmapDrawable21 extends RoundedBitmapDrawable {
protected RoundedBitmapDrawable21(Resources res, Bitmap bitmap) {
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.java b/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.java
index 3c3eed9..7bd0157 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/RoundedBitmapDrawableFactory.java
@@ -21,12 +21,13 @@
import android.graphics.BitmapFactory;
import android.graphics.Rect;
import android.os.Build;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.graphics.BitmapCompat;
import androidx.core.view.GravityCompat;
import androidx.core.view.ViewCompat;
-import android.util.Log;
import java.io.InputStream;
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/TintAwareDrawable.java b/compat/src/main/java/androidx/core/graphics/drawable/TintAwareDrawable.java
index 3b59f06..651ab87 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/TintAwareDrawable.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/TintAwareDrawable.java
@@ -20,6 +20,7 @@
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
+
import androidx.annotation.ColorInt;
import androidx.annotation.RestrictTo;
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawable.java b/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawable.java
index edf0663..ff6de25 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawable.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawable.java
@@ -19,6 +19,7 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.graphics.drawable.Drawable;
+
import androidx.annotation.RestrictTo;
/**
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi14.java b/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi14.java
index 527e417..021084c 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi14.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi14.java
@@ -24,6 +24,7 @@
import android.graphics.Rect;
import android.graphics.Region;
import android.graphics.drawable.Drawable;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi19.java b/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi19.java
index 1ab3f98..8f615f8 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi19.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi19.java
@@ -18,6 +18,7 @@
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
diff --git a/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi21.java b/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi21.java
index ed5c386..3be9595 100644
--- a/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi21.java
+++ b/compat/src/main/java/androidx/core/graphics/drawable/WrappedDrawableApi21.java
@@ -27,10 +27,11 @@
import android.graphics.drawable.InsetDrawable;
import android.graphics.drawable.RippleDrawable;
import android.os.Build;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
-import android.util.Log;
import java.lang.reflect.Method;
diff --git a/compat/src/main/java/androidx/core/hardware/display/DisplayManagerCompat.java b/compat/src/main/java/androidx/core/hardware/display/DisplayManagerCompat.java
index 98f5161..0276654 100644
--- a/compat/src/main/java/androidx/core/hardware/display/DisplayManagerCompat.java
+++ b/compat/src/main/java/androidx/core/hardware/display/DisplayManagerCompat.java
@@ -19,11 +19,12 @@
import android.content.Context;
import android.hardware.display.DisplayManager;
import android.os.Build;
+import android.view.Display;
+import android.view.WindowManager;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
-import android.view.Display;
-import android.view.WindowManager;
import java.util.WeakHashMap;
diff --git a/compat/src/main/java/androidx/core/hardware/fingerprint/FingerprintManagerCompat.java b/compat/src/main/java/androidx/core/hardware/fingerprint/FingerprintManagerCompat.java
index 4657c83..89a096e 100644
--- a/compat/src/main/java/androidx/core/hardware/fingerprint/FingerprintManagerCompat.java
+++ b/compat/src/main/java/androidx/core/hardware/fingerprint/FingerprintManagerCompat.java
@@ -21,6 +21,7 @@
import android.hardware.fingerprint.FingerprintManager;
import android.os.Build;
import android.os.Handler;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
diff --git a/compat/src/main/java/androidx/core/internal/view/SupportMenu.java b/compat/src/main/java/androidx/core/internal/view/SupportMenu.java
index 6098735..db10567 100644
--- a/compat/src/main/java/androidx/core/internal/view/SupportMenu.java
+++ b/compat/src/main/java/androidx/core/internal/view/SupportMenu.java
@@ -18,9 +18,10 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
-import androidx.annotation.RestrictTo;
import android.view.KeyEvent;
+import androidx.annotation.RestrictTo;
+
/**
* Interface for managing the items in a menu.
*
diff --git a/compat/src/main/java/androidx/core/internal/view/SupportMenuItem.java b/compat/src/main/java/androidx/core/internal/view/SupportMenuItem.java
index 569ae7a..affe637 100644
--- a/compat/src/main/java/androidx/core/internal/view/SupportMenuItem.java
+++ b/compat/src/main/java/androidx/core/internal/view/SupportMenuItem.java
@@ -21,11 +21,12 @@
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
-import androidx.annotation.RestrictTo;
-import androidx.core.view.ActionProvider;
import android.view.MenuItem;
import android.view.View;
+import androidx.annotation.RestrictTo;
+import androidx.core.view.ActionProvider;
+
/**
* Interface for direct access to a previously created menu item.
*
diff --git a/compat/src/main/java/androidx/core/net/ConnectivityManagerCompat.java b/compat/src/main/java/androidx/core/net/ConnectivityManagerCompat.java
index 954d0a4..333e9d3 100644
--- a/compat/src/main/java/androidx/core/net/ConnectivityManagerCompat.java
+++ b/compat/src/main/java/androidx/core/net/ConnectivityManagerCompat.java
@@ -25,12 +25,14 @@
import static android.net.ConnectivityManager.TYPE_MOBILE_SUPL;
import static android.net.ConnectivityManager.TYPE_WIFI;
import static android.net.ConnectivityManager.TYPE_WIMAX;
+
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Build;
+
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/compat/src/main/java/androidx/core/net/TrafficStatsCompat.java b/compat/src/main/java/androidx/core/net/TrafficStatsCompat.java
index 2ecfab8..8fc3216 100644
--- a/compat/src/main/java/androidx/core/net/TrafficStatsCompat.java
+++ b/compat/src/main/java/androidx/core/net/TrafficStatsCompat.java
@@ -19,6 +19,7 @@
import android.net.TrafficStats;
import android.os.Build;
import android.os.ParcelFileDescriptor;
+
import androidx.annotation.NonNull;
import java.net.DatagramSocket;
diff --git a/compat/src/main/java/androidx/core/os/LocaleListCompat.java b/compat/src/main/java/androidx/core/os/LocaleListCompat.java
index 89ddac5..a933877 100644
--- a/compat/src/main/java/androidx/core/os/LocaleListCompat.java
+++ b/compat/src/main/java/androidx/core/os/LocaleListCompat.java
@@ -18,6 +18,7 @@
import android.os.Build;
import android.os.LocaleList;
+
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/compat/src/main/java/androidx/core/os/LocaleListHelper.java b/compat/src/main/java/androidx/core/os/LocaleListHelper.java
index b48f096..dd210bc 100644
--- a/compat/src/main/java/androidx/core/os/LocaleListHelper.java
+++ b/compat/src/main/java/androidx/core/os/LocaleListHelper.java
@@ -19,6 +19,7 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.os.Build;
+
import androidx.annotation.GuardedBy;
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
diff --git a/compat/src/main/java/androidx/core/provider/FontRequest.java b/compat/src/main/java/androidx/core/provider/FontRequest.java
index 6e4079a..c539a04 100644
--- a/compat/src/main/java/androidx/core/provider/FontRequest.java
+++ b/compat/src/main/java/androidx/core/provider/FontRequest.java
@@ -18,12 +18,13 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+import android.util.Base64;
+
import androidx.annotation.ArrayRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.core.util.Preconditions;
-import android.util.Base64;
import java.util.List;
diff --git a/compat/src/main/java/androidx/core/provider/FontsContractCompat.java b/compat/src/main/java/androidx/core/provider/FontsContractCompat.java
index 5513582..60963a9 100644
--- a/compat/src/main/java/androidx/core/provider/FontsContractCompat.java
+++ b/compat/src/main/java/androidx/core/provider/FontsContractCompat.java
@@ -36,6 +36,7 @@
import android.os.ParcelFileDescriptor;
import android.os.Process;
import android.provider.BaseColumns;
+
import androidx.annotation.GuardedBy;
import androidx.annotation.IntDef;
import androidx.annotation.IntRange;
@@ -44,14 +45,14 @@
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
import androidx.annotation.VisibleForTesting;
+import androidx.collection.LruCache;
+import androidx.collection.SimpleArrayMap;
import androidx.core.content.res.FontResourcesParserCompat;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.TypefaceCompat;
import androidx.core.graphics.TypefaceCompatUtil;
import androidx.core.provider.SelfDestructiveThread.ReplyCallback;
-import androidx.collection.LruCache;
import androidx.core.util.Preconditions;
-import androidx.collection.SimpleArrayMap;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/compat/src/main/java/androidx/core/provider/SelfDestructiveThread.java b/compat/src/main/java/androidx/core/provider/SelfDestructiveThread.java
index 1a07232..9a51af1 100644
--- a/compat/src/main/java/androidx/core/provider/SelfDestructiveThread.java
+++ b/compat/src/main/java/androidx/core/provider/SelfDestructiveThread.java
@@ -22,6 +22,7 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Message;
+
import androidx.annotation.GuardedBy;
import androidx.annotation.RestrictTo;
import androidx.annotation.VisibleForTesting;
diff --git a/compat/src/main/java/androidx/core/text/BidiFormatter.java b/compat/src/main/java/androidx/core/text/BidiFormatter.java
index 00dd3fd..a53d7f6 100644
--- a/compat/src/main/java/androidx/core/text/BidiFormatter.java
+++ b/compat/src/main/java/androidx/core/text/BidiFormatter.java
@@ -16,12 +16,13 @@
package androidx.core.text;
-import androidx.core.view.ViewCompat;
+import static androidx.core.text.TextDirectionHeuristicsCompat.FIRSTSTRONG_LTR;
+
import android.text.SpannableStringBuilder;
-import java.util.Locale;
+import androidx.core.view.ViewCompat;
-import static androidx.core.text.TextDirectionHeuristicsCompat.FIRSTSTRONG_LTR;
+import java.util.Locale;
/**
* Utility class for formatting text for display in a potentially opposite-directionality context
diff --git a/compat/src/main/java/androidx/core/text/ICUCompat.java b/compat/src/main/java/androidx/core/text/ICUCompat.java
index 8b3be3b..25143d6 100644
--- a/compat/src/main/java/androidx/core/text/ICUCompat.java
+++ b/compat/src/main/java/androidx/core/text/ICUCompat.java
@@ -17,9 +17,10 @@
package androidx.core.text;
import android.os.Build;
-import androidx.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Locale;
diff --git a/compat/src/main/java/androidx/core/text/TextUtilsCompat.java b/compat/src/main/java/androidx/core/text/TextUtilsCompat.java
index 1ea085c..b6575f8 100644
--- a/compat/src/main/java/androidx/core/text/TextUtilsCompat.java
+++ b/compat/src/main/java/androidx/core/text/TextUtilsCompat.java
@@ -18,10 +18,11 @@
import static android.os.Build.VERSION.SDK_INT;
+import android.text.TextUtils;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
-import android.text.TextUtils;
import java.util.Locale;
diff --git a/compat/src/main/java/androidx/core/text/util/LinkifyCompat.java b/compat/src/main/java/androidx/core/text/util/LinkifyCompat.java
index aaa49c1..24e8a2e 100644
--- a/compat/src/main/java/androidx/core/text/util/LinkifyCompat.java
+++ b/compat/src/main/java/androidx/core/text/util/LinkifyCompat.java
@@ -19,12 +19,6 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.annotation.SuppressLint;
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
-import androidx.core.os.BuildCompat;
-import androidx.core.util.PatternsCompat;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.Spanned;
@@ -37,6 +31,13 @@
import android.webkit.WebView;
import android.widget.TextView;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.core.os.BuildCompat;
+import androidx.core.util.PatternsCompat;
+
import java.io.UnsupportedEncodingException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/compat/src/main/java/androidx/core/util/AtomicFile.java b/compat/src/main/java/androidx/core/util/AtomicFile.java
index 5f56dca..b39064c 100644
--- a/compat/src/main/java/androidx/core/util/AtomicFile.java
+++ b/compat/src/main/java/androidx/core/util/AtomicFile.java
@@ -16,9 +16,10 @@
package androidx.core.util;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.util.Log;
import java.io.File;
import java.io.FileInputStream;
diff --git a/compat/src/main/java/androidx/core/util/LogWriter.java b/compat/src/main/java/androidx/core/util/LogWriter.java
index a7d26b8..52eef6a 100644
--- a/compat/src/main/java/androidx/core/util/LogWriter.java
+++ b/compat/src/main/java/androidx/core/util/LogWriter.java
@@ -18,9 +18,10 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
-import androidx.annotation.RestrictTo;
import android.util.Log;
+import androidx.annotation.RestrictTo;
+
import java.io.Writer;
/**
diff --git a/compat/src/main/java/androidx/core/util/ObjectsCompat.java b/compat/src/main/java/androidx/core/util/ObjectsCompat.java
index 5bb59af..e5985fa 100644
--- a/compat/src/main/java/androidx/core/util/ObjectsCompat.java
+++ b/compat/src/main/java/androidx/core/util/ObjectsCompat.java
@@ -16,6 +16,7 @@
package androidx.core.util;
import android.os.Build;
+
import androidx.annotation.Nullable;
import java.util.Arrays;
diff --git a/compat/src/main/java/androidx/core/util/Preconditions.java b/compat/src/main/java/androidx/core/util/Preconditions.java
index 295834a..eb5bdd6 100644
--- a/compat/src/main/java/androidx/core/util/Preconditions.java
+++ b/compat/src/main/java/androidx/core/util/Preconditions.java
@@ -16,10 +16,11 @@
package androidx.core.util;
+import android.text.TextUtils;
+
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.RestrictTo;
-import android.text.TextUtils;
import java.util.Collection;
import java.util.Locale;
diff --git a/compat/src/main/java/androidx/core/view/AccessibilityDelegateCompat.java b/compat/src/main/java/androidx/core/view/AccessibilityDelegateCompat.java
index 8b97a4e..00d5ac6 100644
--- a/compat/src/main/java/androidx/core/view/AccessibilityDelegateCompat.java
+++ b/compat/src/main/java/androidx/core/view/AccessibilityDelegateCompat.java
@@ -18,9 +18,6 @@
import android.os.Build;
import android.os.Bundle;
-import androidx.annotation.RequiresApi;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
import android.view.View;
import android.view.View.AccessibilityDelegate;
import android.view.ViewGroup;
@@ -28,6 +25,10 @@
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeProvider;
+import androidx.annotation.RequiresApi;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
+
/**
* Helper for accessing {@link AccessibilityDelegate}.
* <p>
diff --git a/compat/src/main/java/androidx/core/view/ActionProvider.java b/compat/src/main/java/androidx/core/view/ActionProvider.java
index e58fade..0cd19f0 100644
--- a/compat/src/main/java/androidx/core/view/ActionProvider.java
+++ b/compat/src/main/java/androidx/core/view/ActionProvider.java
@@ -19,12 +19,13 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.content.Context;
-import androidx.annotation.RestrictTo;
import android.util.Log;
import android.view.MenuItem;
import android.view.SubMenu;
import android.view.View;
+import androidx.annotation.RestrictTo;
+
/**
* This class is a mediator for accomplishing a given task, for example sharing a file. It is
* responsible for creating a view that performs an action that accomplishes the task. This class
diff --git a/compat/src/main/java/androidx/core/view/DragAndDropPermissionsCompat.java b/compat/src/main/java/androidx/core/view/DragAndDropPermissionsCompat.java
index 6d55fe8..3f2e787 100644
--- a/compat/src/main/java/androidx/core/view/DragAndDropPermissionsCompat.java
+++ b/compat/src/main/java/androidx/core/view/DragAndDropPermissionsCompat.java
@@ -20,11 +20,12 @@
import android.app.Activity;
import android.os.Build;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
import android.view.DragAndDropPermissions;
import android.view.DragEvent;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+
/**
* Helper for accessing features in {@link android.view.DragAndDropPermissions} a backwards
* compatible fashion.
diff --git a/compat/src/main/java/androidx/core/view/LayoutInflaterCompat.java b/compat/src/main/java/androidx/core/view/LayoutInflaterCompat.java
index 768673a..889f9a3 100644
--- a/compat/src/main/java/androidx/core/view/LayoutInflaterCompat.java
+++ b/compat/src/main/java/androidx/core/view/LayoutInflaterCompat.java
@@ -18,13 +18,14 @@
import android.content.Context;
import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
import java.lang.reflect.Field;
/**
diff --git a/compat/src/main/java/androidx/core/view/MenuCompat.java b/compat/src/main/java/androidx/core/view/MenuCompat.java
index 9510d73..f55d2f2 100644
--- a/compat/src/main/java/androidx/core/view/MenuCompat.java
+++ b/compat/src/main/java/androidx/core/view/MenuCompat.java
@@ -17,11 +17,12 @@
package androidx.core.view;
import android.annotation.SuppressLint;
-import androidx.core.internal.view.SupportMenu;
-import androidx.core.os.BuildCompat;
import android.view.Menu;
import android.view.MenuItem;
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.os.BuildCompat;
+
/**
* Helper for accessing features in {@link android.view.Menu}.
*/
diff --git a/compat/src/main/java/androidx/core/view/MenuItemCompat.java b/compat/src/main/java/androidx/core/view/MenuItemCompat.java
index 675a2a3..d367052 100644
--- a/compat/src/main/java/androidx/core/view/MenuItemCompat.java
+++ b/compat/src/main/java/androidx/core/view/MenuItemCompat.java
@@ -20,14 +20,15 @@
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import androidx.annotation.RequiresApi;
-import androidx.core.internal.view.SupportMenuItem;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import androidx.annotation.RequiresApi;
+import androidx.core.internal.view.SupportMenuItem;
+
/**
* Helper for accessing features in {@link android.view.MenuItem}.
* <p class="note"><strong>Note:</strong> You cannot get an instance of this class. Instead,
diff --git a/compat/src/main/java/androidx/core/view/NestedScrollingChild.java b/compat/src/main/java/androidx/core/view/NestedScrollingChild.java
index 85a5371..ba616fe 100644
--- a/compat/src/main/java/androidx/core/view/NestedScrollingChild.java
+++ b/compat/src/main/java/androidx/core/view/NestedScrollingChild.java
@@ -17,14 +17,15 @@
package androidx.core.view;
-import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat.ScrollAxis;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewParent;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat.ScrollAxis;
+
/**
* This interface should be implemented by {@link android.view.View View} subclasses that wish
* to support dispatching nested scrolling operations to a cooperating parent
diff --git a/compat/src/main/java/androidx/core/view/NestedScrollingChild2.java b/compat/src/main/java/androidx/core/view/NestedScrollingChild2.java
index 2e88360..2da12a4 100644
--- a/compat/src/main/java/androidx/core/view/NestedScrollingChild2.java
+++ b/compat/src/main/java/androidx/core/view/NestedScrollingChild2.java
@@ -17,13 +17,14 @@
package androidx.core.view;
-import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat.NestedScrollType;
-import androidx.core.view.ViewCompat.ScrollAxis;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewParent;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat.NestedScrollType;
+import androidx.core.view.ViewCompat.ScrollAxis;
+
/**
* This interface should be implemented by {@link View View} subclasses that wish
* to support dispatching nested scrolling operations to a cooperating parent
diff --git a/compat/src/main/java/androidx/core/view/NestedScrollingChildHelper.java b/compat/src/main/java/androidx/core/view/NestedScrollingChildHelper.java
index 0735a7b..8e89602 100644
--- a/compat/src/main/java/androidx/core/view/NestedScrollingChildHelper.java
+++ b/compat/src/main/java/androidx/core/view/NestedScrollingChildHelper.java
@@ -20,12 +20,13 @@
import static androidx.core.view.ViewCompat.TYPE_NON_TOUCH;
import static androidx.core.view.ViewCompat.TYPE_TOUCH;
+import android.view.View;
+import android.view.ViewParent;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat.NestedScrollType;
import androidx.core.view.ViewCompat.ScrollAxis;
-import android.view.View;
-import android.view.ViewParent;
/**
* Helper class for implementing nested scrolling child views compatible with Android platform
diff --git a/compat/src/main/java/androidx/core/view/NestedScrollingParent.java b/compat/src/main/java/androidx/core/view/NestedScrollingParent.java
index ff7108a..b6bd3ca 100644
--- a/compat/src/main/java/androidx/core/view/NestedScrollingParent.java
+++ b/compat/src/main/java/androidx/core/view/NestedScrollingParent.java
@@ -17,13 +17,14 @@
package androidx.core.view;
-import androidx.annotation.NonNull;
-import androidx.core.view.ViewCompat.ScrollAxis;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;
import android.view.ViewConfiguration;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat.ScrollAxis;
+
/**
* This interface should be implemented by {@link android.view.ViewGroup ViewGroup} subclasses
* that wish to support scrolling operations delegated by a nested child view.
diff --git a/compat/src/main/java/androidx/core/view/NestedScrollingParent2.java b/compat/src/main/java/androidx/core/view/NestedScrollingParent2.java
index 4aac29d..d888700 100644
--- a/compat/src/main/java/androidx/core/view/NestedScrollingParent2.java
+++ b/compat/src/main/java/androidx/core/view/NestedScrollingParent2.java
@@ -17,11 +17,12 @@
package androidx.core.view;
+import android.view.MotionEvent;
+import android.view.View;
+
import androidx.annotation.NonNull;
import androidx.core.view.ViewCompat.NestedScrollType;
import androidx.core.view.ViewCompat.ScrollAxis;
-import android.view.MotionEvent;
-import android.view.View;
/**
* This interface should be implemented by {@link android.view.ViewGroup ViewGroup} subclasses
diff --git a/compat/src/main/java/androidx/core/view/NestedScrollingParentHelper.java b/compat/src/main/java/androidx/core/view/NestedScrollingParentHelper.java
index 814e43b..8beeddc 100644
--- a/compat/src/main/java/androidx/core/view/NestedScrollingParentHelper.java
+++ b/compat/src/main/java/androidx/core/view/NestedScrollingParentHelper.java
@@ -17,11 +17,12 @@
package androidx.core.view;
+import android.view.View;
+import android.view.ViewGroup;
+
import androidx.annotation.NonNull;
import androidx.core.view.ViewCompat.NestedScrollType;
import androidx.core.view.ViewCompat.ScrollAxis;
-import android.view.View;
-import android.view.ViewGroup;
/**
* Helper class for implementing nested scrolling parent views compatible with Android platform
diff --git a/compat/src/main/java/androidx/core/view/PointerIconCompat.java b/compat/src/main/java/androidx/core/view/PointerIconCompat.java
index 68f1e76..54e55d7 100644
--- a/compat/src/main/java/androidx/core/view/PointerIconCompat.java
+++ b/compat/src/main/java/androidx/core/view/PointerIconCompat.java
@@ -17,14 +17,16 @@
package androidx.core.view;
import static android.os.Build.VERSION.SDK_INT;
+
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
-import androidx.annotation.RestrictTo;
import android.view.PointerIcon;
+import androidx.annotation.RestrictTo;
+
/**
* Helper for accessing features in {@link android.view.PointerIcon} in a backwards compatible
* fashion.
diff --git a/compat/src/main/java/androidx/core/view/TintableBackgroundView.java b/compat/src/main/java/androidx/core/view/TintableBackgroundView.java
index 2fa940a..c2c5e5d 100644
--- a/compat/src/main/java/androidx/core/view/TintableBackgroundView.java
+++ b/compat/src/main/java/androidx/core/view/TintableBackgroundView.java
@@ -18,6 +18,7 @@
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
+
import androidx.annotation.Nullable;
/**
diff --git a/compat/src/main/java/androidx/core/view/ViewCompat.java b/compat/src/main/java/androidx/core/view/ViewCompat.java
index 4fe052f..ca61b74 100644
--- a/compat/src/main/java/androidx/core/view/ViewCompat.java
+++ b/compat/src/main/java/androidx/core/view/ViewCompat.java
@@ -30,15 +30,6 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
-import androidx.annotation.FloatRange;
-import androidx.annotation.IdRes;
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.RestrictTo;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
import android.util.Log;
import android.view.Display;
import android.view.MotionEvent;
@@ -53,6 +44,16 @@
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeProvider;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IdRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
diff --git a/compat/src/main/java/androidx/core/view/ViewConfigurationCompat.java b/compat/src/main/java/androidx/core/view/ViewConfigurationCompat.java
index 5e9bae2..89c3ca5 100644
--- a/compat/src/main/java/androidx/core/view/ViewConfigurationCompat.java
+++ b/compat/src/main/java/androidx/core/view/ViewConfigurationCompat.java
@@ -18,11 +18,12 @@
import android.content.Context;
import android.os.Build;
-import androidx.annotation.NonNull;
import android.util.Log;
import android.util.TypedValue;
import android.view.ViewConfiguration;
+import androidx.annotation.NonNull;
+
import java.lang.reflect.Method;
/**
diff --git a/compat/src/main/java/androidx/core/view/ViewGroupCompat.java b/compat/src/main/java/androidx/core/view/ViewGroupCompat.java
index a00914d..95783cc 100644
--- a/compat/src/main/java/androidx/core/view/ViewGroupCompat.java
+++ b/compat/src/main/java/androidx/core/view/ViewGroupCompat.java
@@ -17,13 +17,14 @@
package androidx.core.view;
import android.os.Build;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
+
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.core.R;
import androidx.core.view.ViewCompat.ScrollAxis;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
/**
* Helper for accessing features in {@link ViewGroup}.
diff --git a/compat/src/main/java/androidx/core/view/ViewParentCompat.java b/compat/src/main/java/androidx/core/view/ViewParentCompat.java
index 59aab73..1786ee3 100644
--- a/compat/src/main/java/androidx/core/view/ViewParentCompat.java
+++ b/compat/src/main/java/androidx/core/view/ViewParentCompat.java
@@ -17,7 +17,6 @@
package androidx.core.view;
import android.os.Build;
-import androidx.annotation.RequiresApi;
import android.util.Log;
import android.view.MotionEvent;
import android.view.VelocityTracker;
@@ -26,6 +25,8 @@
import android.view.ViewParent;
import android.view.accessibility.AccessibilityEvent;
+import androidx.annotation.RequiresApi;
+
/**
* Helper for accessing features in {@link ViewParent}.
*/
diff --git a/compat/src/main/java/androidx/core/view/WindowCompat.java b/compat/src/main/java/androidx/core/view/WindowCompat.java
index b8ae839..5ee42a2 100644
--- a/compat/src/main/java/androidx/core/view/WindowCompat.java
+++ b/compat/src/main/java/androidx/core/view/WindowCompat.java
@@ -16,11 +16,12 @@
package androidx.core.view;
-import androidx.annotation.IdRes;
-import androidx.annotation.NonNull;
import android.view.View;
import android.view.Window;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+
/**
* Helper for accessing features in {@link Window}.
*/
diff --git a/compat/src/main/java/androidx/core/view/accessibility/AccessibilityManagerCompat.java b/compat/src/main/java/androidx/core/view/accessibility/AccessibilityManagerCompat.java
index c4879b1..96eefdc 100644
--- a/compat/src/main/java/androidx/core/view/accessibility/AccessibilityManagerCompat.java
+++ b/compat/src/main/java/androidx/core/view/accessibility/AccessibilityManagerCompat.java
@@ -18,9 +18,10 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.os.Build;
+import android.view.accessibility.AccessibilityManager;
+
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
-import android.view.accessibility.AccessibilityManager;
import java.util.List;
diff --git a/compat/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java b/compat/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java
index b37e0a2..16b570f 100644
--- a/compat/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java
+++ b/compat/src/main/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompat.java
@@ -21,15 +21,16 @@
import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
+import android.text.InputType;
+import android.view.View;
+import android.view.accessibility.AccessibilityNodeInfo;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.core.accessibilityservice.AccessibilityServiceInfoCompat;
import androidx.core.os.BuildCompat;
import androidx.core.view.ViewCompat;
-import android.text.InputType;
-import android.view.View;
-import android.view.accessibility.AccessibilityNodeInfo;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/compat/src/main/java/androidx/core/view/accessibility/AccessibilityNodeProviderCompat.java b/compat/src/main/java/androidx/core/view/accessibility/AccessibilityNodeProviderCompat.java
index addc314..eb2c992 100644
--- a/compat/src/main/java/androidx/core/view/accessibility/AccessibilityNodeProviderCompat.java
+++ b/compat/src/main/java/androidx/core/view/accessibility/AccessibilityNodeProviderCompat.java
@@ -18,11 +18,12 @@
import android.os.Build;
import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeProvider;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/compat/src/main/java/androidx/core/view/accessibility/AccessibilityRecordCompat.java b/compat/src/main/java/androidx/core/view/accessibility/AccessibilityRecordCompat.java
index ccf7ea4..d56d404 100644
--- a/compat/src/main/java/androidx/core/view/accessibility/AccessibilityRecordCompat.java
+++ b/compat/src/main/java/androidx/core/view/accessibility/AccessibilityRecordCompat.java
@@ -18,11 +18,12 @@
import android.os.Build;
import android.os.Parcelable;
-import androidx.annotation.NonNull;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityRecord;
+import androidx.annotation.NonNull;
+
import java.util.List;
/**
diff --git a/compat/src/main/java/androidx/core/view/inputmethod/EditorInfoCompat.java b/compat/src/main/java/androidx/core/view/inputmethod/EditorInfoCompat.java
index 6e32b89..3d0eee3 100644
--- a/compat/src/main/java/androidx/core/view/inputmethod/EditorInfoCompat.java
+++ b/compat/src/main/java/androidx/core/view/inputmethod/EditorInfoCompat.java
@@ -18,9 +18,10 @@
import android.os.Build;
import android.os.Bundle;
+import android.view.inputmethod.EditorInfo;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.view.inputmethod.EditorInfo;
/**
* Helper for accessing features in {@link EditorInfo} in a backwards compatible fashion.
diff --git a/compat/src/main/java/androidx/core/view/inputmethod/InputConnectionCompat.java b/compat/src/main/java/androidx/core/view/inputmethod/InputConnectionCompat.java
index c19740b..e9b10a6 100644
--- a/compat/src/main/java/androidx/core/view/inputmethod/InputConnectionCompat.java
+++ b/compat/src/main/java/androidx/core/view/inputmethod/InputConnectionCompat.java
@@ -21,14 +21,15 @@
import android.os.Build;
import android.os.Bundle;
import android.os.ResultReceiver;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputConnectionWrapper;
import android.view.inputmethod.InputContentInfo;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
* Helper for accessing features in {@link InputConnection} introduced after API level 13 in a
* backwards compatible fashion.
diff --git a/compat/src/main/java/androidx/core/view/inputmethod/InputContentInfoCompat.java b/compat/src/main/java/androidx/core/view/inputmethod/InputContentInfoCompat.java
index a9fb1d8..dc63be5 100644
--- a/compat/src/main/java/androidx/core/view/inputmethod/InputContentInfoCompat.java
+++ b/compat/src/main/java/androidx/core/view/inputmethod/InputContentInfoCompat.java
@@ -19,10 +19,11 @@
import android.content.ClipDescription;
import android.net.Uri;
import android.os.Build;
+import android.view.inputmethod.InputContentInfo;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
-import android.view.inputmethod.InputContentInfo;
/**
* Helper for accessing features in InputContentInfo introduced after API level 13 in a backwards
diff --git a/compat/src/main/java/androidx/core/widget/AutoScrollHelper.java b/compat/src/main/java/androidx/core/widget/AutoScrollHelper.java
index 079c24d..fe2be2a 100644
--- a/compat/src/main/java/androidx/core/widget/AutoScrollHelper.java
+++ b/compat/src/main/java/androidx/core/widget/AutoScrollHelper.java
@@ -18,8 +18,6 @@
import android.content.res.Resources;
import android.os.SystemClock;
-import androidx.annotation.NonNull;
-import androidx.core.view.ViewCompat;
import android.util.DisplayMetrics;
import android.view.MotionEvent;
import android.view.View;
@@ -28,6 +26,9 @@
import android.view.animation.AnimationUtils;
import android.view.animation.Interpolator;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+
/**
* AutoScrollHelper is a utility class for adding automatic edge-triggered
* scrolling to Views.
diff --git a/compat/src/main/java/androidx/core/widget/AutoSizeableTextView.java b/compat/src/main/java/androidx/core/widget/AutoSizeableTextView.java
index d33c7eb..93994c5 100644
--- a/compat/src/main/java/androidx/core/widget/AutoSizeableTextView.java
+++ b/compat/src/main/java/androidx/core/widget/AutoSizeableTextView.java
@@ -19,9 +19,10 @@
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.os.Build;
+import android.util.TypedValue;
+
import androidx.annotation.NonNull;
import androidx.annotation.RestrictTo;
-import android.util.TypedValue;
/**
* Interface which allows a {@link android.widget.TextView} to receive background auto-sizing calls
diff --git a/compat/src/main/java/androidx/core/widget/CompoundButtonCompat.java b/compat/src/main/java/androidx/core/widget/CompoundButtonCompat.java
index 56785dc..519f98a 100644
--- a/compat/src/main/java/androidx/core/widget/CompoundButtonCompat.java
+++ b/compat/src/main/java/androidx/core/widget/CompoundButtonCompat.java
@@ -20,12 +20,13 @@
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
+import android.util.Log;
+import android.widget.CompoundButton;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.graphics.drawable.DrawableCompat;
-import android.util.Log;
-import android.widget.CompoundButton;
import java.lang.reflect.Field;
diff --git a/compat/src/main/java/androidx/core/widget/ContentLoadingProgressBar.java b/compat/src/main/java/androidx/core/widget/ContentLoadingProgressBar.java
index afa2ce6..e24b6a1 100644
--- a/compat/src/main/java/androidx/core/widget/ContentLoadingProgressBar.java
+++ b/compat/src/main/java/androidx/core/widget/ContentLoadingProgressBar.java
@@ -17,12 +17,13 @@
package androidx.core.widget;
import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ProgressBar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
* ContentLoadingProgressBar implements a ProgressBar that waits a minimum time to be
* dismissed before showing. Once visible, the progress bar will be visible for
diff --git a/compat/src/main/java/androidx/core/widget/EdgeEffectCompat.java b/compat/src/main/java/androidx/core/widget/EdgeEffectCompat.java
index a462432..5419130 100644
--- a/compat/src/main/java/androidx/core/widget/EdgeEffectCompat.java
+++ b/compat/src/main/java/androidx/core/widget/EdgeEffectCompat.java
@@ -18,9 +18,10 @@
import android.content.Context;
import android.graphics.Canvas;
import android.os.Build;
+import android.widget.EdgeEffect;
+
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
-import android.widget.EdgeEffect;
/**
* Helper for accessing {@link android.widget.EdgeEffect}.
diff --git a/compat/src/main/java/androidx/core/widget/ImageViewCompat.java b/compat/src/main/java/androidx/core/widget/ImageViewCompat.java
index 9b589d9..ce93724 100644
--- a/compat/src/main/java/androidx/core/widget/ImageViewCompat.java
+++ b/compat/src/main/java/androidx/core/widget/ImageViewCompat.java
@@ -20,10 +20,11 @@
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
+import android.widget.ImageView;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
-import android.widget.ImageView;
/**
* Helper for accessing features in {@link ImageView}.
diff --git a/compat/src/main/java/androidx/core/widget/ListPopupWindowCompat.java b/compat/src/main/java/androidx/core/widget/ListPopupWindowCompat.java
index 869501d..c4f8236 100644
--- a/compat/src/main/java/androidx/core/widget/ListPopupWindowCompat.java
+++ b/compat/src/main/java/androidx/core/widget/ListPopupWindowCompat.java
@@ -17,12 +17,13 @@
package androidx.core.widget;
import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.view.View;
import android.view.View.OnTouchListener;
import android.widget.ListPopupWindow;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
* Helper for accessing features in {@link ListPopupWindow}.
*/
diff --git a/compat/src/main/java/androidx/core/widget/ListViewAutoScrollHelper.java b/compat/src/main/java/androidx/core/widget/ListViewAutoScrollHelper.java
index 5621715..cb42148 100644
--- a/compat/src/main/java/androidx/core/widget/ListViewAutoScrollHelper.java
+++ b/compat/src/main/java/androidx/core/widget/ListViewAutoScrollHelper.java
@@ -16,10 +16,11 @@
package androidx.core.widget;
-import androidx.annotation.NonNull;
import android.view.View;
import android.widget.ListView;
+import androidx.annotation.NonNull;
+
/**
* An implementation of {@link AutoScrollHelper} that knows how to scroll
* through a {@link ListView}.
diff --git a/compat/src/main/java/androidx/core/widget/ListViewCompat.java b/compat/src/main/java/androidx/core/widget/ListViewCompat.java
index a66f9fb..4e7cb4d 100644
--- a/compat/src/main/java/androidx/core/widget/ListViewCompat.java
+++ b/compat/src/main/java/androidx/core/widget/ListViewCompat.java
@@ -17,10 +17,11 @@
package androidx.core.widget;
import android.os.Build;
-import androidx.annotation.NonNull;
import android.view.View;
import android.widget.ListView;
+import androidx.annotation.NonNull;
+
/**
* Helper for accessing features in {@link ListView}
*/
diff --git a/compat/src/main/java/androidx/core/widget/NestedScrollView.java b/compat/src/main/java/androidx/core/widget/NestedScrollView.java
index 6b731ab..2490bd4 100644
--- a/compat/src/main/java/androidx/core/widget/NestedScrollView.java
+++ b/compat/src/main/java/androidx/core/widget/NestedScrollView.java
@@ -27,19 +27,6 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
-import androidx.core.view.AccessibilityDelegateCompat;
-import androidx.core.view.InputDeviceCompat;
-import androidx.core.view.NestedScrollingChild2;
-import androidx.core.view.NestedScrollingChildHelper;
-import androidx.core.view.NestedScrollingParent;
-import androidx.core.view.NestedScrollingParentHelper;
-import androidx.core.view.ScrollingView;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.core.view.accessibility.AccessibilityRecordCompat;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TypedValue;
@@ -58,6 +45,20 @@
import android.widget.OverScroller;
import android.widget.ScrollView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.InputDeviceCompat;
+import androidx.core.view.NestedScrollingChild2;
+import androidx.core.view.NestedScrollingChildHelper;
+import androidx.core.view.NestedScrollingParent;
+import androidx.core.view.NestedScrollingParentHelper;
+import androidx.core.view.ScrollingView;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityRecordCompat;
+
import java.util.List;
/**
diff --git a/compat/src/main/java/androidx/core/widget/PopupMenuCompat.java b/compat/src/main/java/androidx/core/widget/PopupMenuCompat.java
index 6eb9e7c..38ffa03 100644
--- a/compat/src/main/java/androidx/core/widget/PopupMenuCompat.java
+++ b/compat/src/main/java/androidx/core/widget/PopupMenuCompat.java
@@ -17,11 +17,12 @@
package androidx.core.widget;
import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.view.View.OnTouchListener;
import android.widget.PopupMenu;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
* Helper for accessing features in {@link PopupMenu}.
*/
diff --git a/compat/src/main/java/androidx/core/widget/PopupWindowCompat.java b/compat/src/main/java/androidx/core/widget/PopupWindowCompat.java
index f0c8f7b..cc97ffa 100644
--- a/compat/src/main/java/androidx/core/widget/PopupWindowCompat.java
+++ b/compat/src/main/java/androidx/core/widget/PopupWindowCompat.java
@@ -17,15 +17,16 @@
package androidx.core.widget;
import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-import androidx.core.view.GravityCompat;
-import androidx.core.view.ViewCompat;
import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.widget.PopupWindow;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/compat/src/main/java/androidx/core/widget/TextViewCompat.java b/compat/src/main/java/androidx/core/widget/TextViewCompat.java
index 65318d5..f82e025 100644
--- a/compat/src/main/java/androidx/core/widget/TextViewCompat.java
+++ b/compat/src/main/java/androidx/core/widget/TextViewCompat.java
@@ -25,13 +25,6 @@
import android.content.pm.ResolveInfo;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.RestrictTo;
-import androidx.annotation.StyleRes;
import android.text.Editable;
import android.util.Log;
import android.util.TypedValue;
@@ -41,6 +34,14 @@
import android.view.View;
import android.widget.TextView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.StyleRes;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
diff --git a/compat/src/main/java/androidx/core/widget/TintableCompoundButton.java b/compat/src/main/java/androidx/core/widget/TintableCompoundButton.java
index e3d47c7..3b367ac 100644
--- a/compat/src/main/java/androidx/core/widget/TintableCompoundButton.java
+++ b/compat/src/main/java/androidx/core/widget/TintableCompoundButton.java
@@ -19,6 +19,7 @@
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
+
import androidx.annotation.Nullable;
/**
diff --git a/compat/src/main/java/androidx/core/widget/TintableImageSourceView.java b/compat/src/main/java/androidx/core/widget/TintableImageSourceView.java
index f2ee1ed..63cfa92 100644
--- a/compat/src/main/java/androidx/core/widget/TintableImageSourceView.java
+++ b/compat/src/main/java/androidx/core/widget/TintableImageSourceView.java
@@ -20,6 +20,7 @@
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
+
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;