Fix imports for loader code.
A follow up after factor to make it so androidx imports go in the
correct order.
Test: ./gradlew buildOnServer
Change-Id: I27106f66adbcf2f057e131214936cc9452f5cbde
diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java
index 7c508ec..510553a 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java
@@ -30,6 +30,11 @@
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
+import androidx.loader.app.test.DelayLoader;
+import androidx.loader.app.test.DummyLoaderCallbacks;
+import androidx.loader.app.test.EmptyActivity;
+import androidx.loader.content.Loader;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -38,11 +43,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import androidx.loader.app.test.DelayLoader;
-import androidx.loader.app.test.DummyLoaderCallbacks;
-import androidx.loader.app.test.EmptyActivity;
-import androidx.loader.content.Loader;
-
@RunWith(AndroidJUnit4.class)
@SmallTest
public class LoaderInfoTest {
diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java
index fb22c68..8ac2dcf 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java
@@ -32,6 +32,12 @@
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.NonNull;
+import androidx.loader.app.test.DelayLoaderCallbacks;
+import androidx.loader.app.test.DummyLoaderCallbacks;
+import androidx.loader.app.test.EmptyActivity;
+import androidx.loader.content.Loader;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,12 +45,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import androidx.annotation.NonNull;
-import androidx.loader.app.test.DelayLoaderCallbacks;
-import androidx.loader.app.test.DummyLoaderCallbacks;
-import androidx.loader.app.test.EmptyActivity;
-import androidx.loader.content.Loader;
-
@RunWith(AndroidJUnit4.class)
@SmallTest
public class LoaderManagerTest {
diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderObserverTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderObserverTest.java
index 8714403..8eb59c1 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderObserverTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderObserverTest.java
@@ -22,6 +22,7 @@
import android.content.Context;
import android.support.test.filters.SmallTest;
+
import androidx.loader.app.test.DummyLoaderCallbacks;
import androidx.loader.content.Loader;
diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderViewModelTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderViewModelTest.java
index 3fb191e..3387eba 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderViewModelTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderViewModelTest.java
@@ -24,13 +24,13 @@
import android.content.Context;
import android.support.test.filters.SmallTest;
+import androidx.loader.app.test.DummyLoader;
+import androidx.loader.content.Loader;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-import androidx.loader.app.test.DummyLoader;
-import androidx.loader.content.Loader;
-
@RunWith(JUnit4.class)
@SmallTest
public class LoaderViewModelTest {
diff --git a/loader/src/androidTest/java/androidx/loader/app/test/DelayLoader.java b/loader/src/androidTest/java/androidx/loader/app/test/DelayLoader.java
index c7c1326..c2e292a 100644
--- a/loader/src/androidTest/java/androidx/loader/app/test/DelayLoader.java
+++ b/loader/src/androidTest/java/androidx/loader/app/test/DelayLoader.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.os.SystemClock;
-import java.util.concurrent.CountDownLatch;
-
import androidx.annotation.Nullable;
import androidx.loader.content.AsyncTaskLoader;
+import java.util.concurrent.CountDownLatch;
+
public class DelayLoader extends AsyncTaskLoader<Boolean> {
private final CountDownLatch mDeliverResultLatch;
diff --git a/loader/src/androidTest/java/androidx/loader/app/test/DelayLoaderCallbacks.java b/loader/src/androidTest/java/androidx/loader/app/test/DelayLoaderCallbacks.java
index 4f01d55..1ed5c21 100644
--- a/loader/src/androidTest/java/androidx/loader/app/test/DelayLoaderCallbacks.java
+++ b/loader/src/androidTest/java/androidx/loader/app/test/DelayLoaderCallbacks.java
@@ -19,12 +19,12 @@
import android.content.Context;
import android.os.Bundle;
-import java.util.concurrent.CountDownLatch;
-
import androidx.annotation.NonNull;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
+import java.util.concurrent.CountDownLatch;
+
public class DelayLoaderCallbacks implements LoaderManager.LoaderCallbacks<Boolean> {
private final Context mContext;
private final CountDownLatch mDeliverResultLatch;
diff --git a/loader/src/androidTest/java/androidx/loader/app/test/DummyLoader.java b/loader/src/androidTest/java/androidx/loader/app/test/DummyLoader.java
index 0f4e650..8646a71 100644
--- a/loader/src/androidTest/java/androidx/loader/app/test/DummyLoader.java
+++ b/loader/src/androidTest/java/androidx/loader/app/test/DummyLoader.java
@@ -17,6 +17,7 @@
package androidx.loader.app.test;
import android.content.Context;
+
import androidx.loader.content.Loader;
public class DummyLoader extends Loader<Boolean> {
diff --git a/loader/src/androidTest/java/androidx/loader/app/test/DummyLoaderCallbacks.java b/loader/src/androidTest/java/androidx/loader/app/test/DummyLoaderCallbacks.java
index c290d2c..45f29ed 100644
--- a/loader/src/androidTest/java/androidx/loader/app/test/DummyLoaderCallbacks.java
+++ b/loader/src/androidTest/java/androidx/loader/app/test/DummyLoaderCallbacks.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.os.Bundle;
+
import androidx.annotation.NonNull;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
diff --git a/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java b/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java
index d430f87..833022b 100644
--- a/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java
+++ b/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java
@@ -18,11 +18,12 @@
import static org.junit.Assert.fail;
-import androidx.annotation.NonNull;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.LargeTest;
import android.support.test.runner.AndroidJUnit4;
+import androidx.annotation.NonNull;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/loader/src/main/java/androidx/loader/app/LoaderManager.java b/loader/src/main/java/androidx/loader/app/LoaderManager.java
index 8b2f38d..764de74 100644
--- a/loader/src/main/java/androidx/loader/app/LoaderManager.java
+++ b/loader/src/main/java/androidx/loader/app/LoaderManager.java
@@ -19,6 +19,7 @@
import android.arch.lifecycle.LifecycleOwner;
import android.arch.lifecycle.ViewModelStoreOwner;
import android.os.Bundle;
+
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/loader/src/main/java/androidx/loader/app/LoaderManagerImpl.java b/loader/src/main/java/androidx/loader/app/LoaderManagerImpl.java
index 0f89cc1..e1f2eee 100644
--- a/loader/src/main/java/androidx/loader/app/LoaderManagerImpl.java
+++ b/loader/src/main/java/androidx/loader/app/LoaderManagerImpl.java
@@ -26,10 +26,6 @@
import android.os.Looper;
import android.util.Log;
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
-import java.lang.reflect.Modifier;
-
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -37,6 +33,10 @@
import androidx.core.util.DebugUtils;
import androidx.loader.content.Loader;
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+import java.lang.reflect.Modifier;
+
class LoaderManagerImpl extends LoaderManager {
static final String TAG = "LoaderManager";
static boolean DEBUG = false;
diff --git a/loader/src/main/java/androidx/loader/content/AsyncTaskLoader.java b/loader/src/main/java/androidx/loader/content/AsyncTaskLoader.java
index ecbab4b..c1ff0ef 100644
--- a/loader/src/main/java/androidx/loader/content/AsyncTaskLoader.java
+++ b/loader/src/main/java/androidx/loader/content/AsyncTaskLoader.java
@@ -21,12 +21,13 @@
import android.content.Context;
import android.os.Handler;
import android.os.SystemClock;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.core.os.OperationCanceledException;
import androidx.core.util.TimeUtils;
-import android.util.Log;
import java.io.FileDescriptor;
import java.io.PrintWriter;
diff --git a/loader/src/main/java/androidx/loader/content/CursorLoader.java b/loader/src/main/java/androidx/loader/content/CursorLoader.java
index 097b2f2..6493bc9 100644
--- a/loader/src/main/java/androidx/loader/content/CursorLoader.java
+++ b/loader/src/main/java/androidx/loader/content/CursorLoader.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContentResolverCompat;
diff --git a/loader/src/main/java/androidx/loader/content/Loader.java b/loader/src/main/java/androidx/loader/content/Loader.java
index 22e6c13..af0513b 100644
--- a/loader/src/main/java/androidx/loader/content/Loader.java
+++ b/loader/src/main/java/androidx/loader/content/Loader.java
@@ -19,16 +19,16 @@
import android.content.Context;
import android.database.ContentObserver;
import android.os.Handler;
+
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.util.DebugUtils;
+import androidx.loader.app.LoaderManager;
import java.io.FileDescriptor;
import java.io.PrintWriter;
-import androidx.loader.app.LoaderManager;
-
/**
* Static library support version of the framework's {@link android.content.Loader}.
* Used to write apps that run on platforms prior to Android 3.0. When running
diff --git a/loader/src/main/java/androidx/loader/content/ModernAsyncTask.java b/loader/src/main/java/androidx/loader/content/ModernAsyncTask.java
index 9b95d14..545a026 100644
--- a/loader/src/main/java/androidx/loader/content/ModernAsyncTask.java
+++ b/loader/src/main/java/androidx/loader/content/ModernAsyncTask.java
@@ -23,6 +23,7 @@
import android.os.Looper;
import android.os.Message;
import android.os.Process;
+
import androidx.annotation.RestrictTo;
import java.util.concurrent.BlockingQueue;