Fix imports for customview code.
A follow up after factor to make it so androidx imports go in the
correct order.
Test: ./gradlew buildOnServer
Change-Id: I09aa5c9a6584bbfcb6e5ab87157fa2b367fcab23
diff --git a/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java b/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java
index b6988a5..95370f4 100644
--- a/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java
+++ b/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java
@@ -22,15 +22,16 @@
import android.graphics.Rect;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.customview.test.R;
import android.support.test.annotation.UiThreadTest;
import android.support.test.filters.SmallTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
+
+import androidx.annotation.NonNull;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import android.view.View;
+import androidx.customview.test.R;
import org.junit.Before;
import org.junit.Rule;
diff --git a/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTestActivity.java b/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTestActivity.java
index 9d0cd68..b4415bd 100644
--- a/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTestActivity.java
+++ b/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTestActivity.java
@@ -18,6 +18,7 @@
import android.app.Activity;
import android.os.Bundle;
+
import androidx.customview.test.R;
public class ExploreByTouchHelperTestActivity extends Activity {
diff --git a/customview/src/main/java/androidx/customview/view/AbsSavedState.java b/customview/src/main/java/androidx/customview/view/AbsSavedState.java
index 515b19d..fad2a60 100644
--- a/customview/src/main/java/androidx/customview/view/AbsSavedState.java
+++ b/customview/src/main/java/androidx/customview/view/AbsSavedState.java
@@ -18,6 +18,7 @@
import android.os.Parcel;
import android.os.Parcelable;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/customview/src/main/java/androidx/customview/widget/ExploreByTouchHelper.java b/customview/src/main/java/androidx/customview/widget/ExploreByTouchHelper.java
index df864db..b49afc8 100644
--- a/customview/src/main/java/androidx/customview/widget/ExploreByTouchHelper.java
+++ b/customview/src/main/java/androidx/customview/widget/ExploreByTouchHelper.java
@@ -19,6 +19,14 @@
import android.content.Context;
import android.graphics.Rect;
import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewParent;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.AccessibilityRecord;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.collection.SparseArrayCompat;
@@ -31,13 +39,6 @@
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
import androidx.core.view.accessibility.AccessibilityRecordCompat;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewParent;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.AccessibilityRecord;
import java.util.ArrayList;
import java.util.List;
diff --git a/customview/src/main/java/androidx/customview/widget/FocusStrategy.java b/customview/src/main/java/androidx/customview/widget/FocusStrategy.java
index 1932374..6c3f860 100644
--- a/customview/src/main/java/androidx/customview/widget/FocusStrategy.java
+++ b/customview/src/main/java/androidx/customview/widget/FocusStrategy.java
@@ -17,11 +17,12 @@
package androidx.customview.widget;
import android.graphics.Rect;
+import android.view.View;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat.FocusRealDirection;
import androidx.core.view.ViewCompat.FocusRelativeDirection;
-import android.view.View;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/customview/src/main/java/androidx/customview/widget/ViewDragHelper.java b/customview/src/main/java/androidx/customview/widget/ViewDragHelper.java
index 2c39eba..3b49dd2 100644
--- a/customview/src/main/java/androidx/customview/widget/ViewDragHelper.java
+++ b/customview/src/main/java/androidx/customview/widget/ViewDragHelper.java
@@ -18,10 +18,6 @@
package androidx.customview.widget;
import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.Px;
-import androidx.core.view.ViewCompat;
import android.util.Log;
import android.view.MotionEvent;
import android.view.VelocityTracker;
@@ -31,6 +27,11 @@
import android.view.animation.Interpolator;
import android.widget.OverScroller;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.core.view.ViewCompat;
+
import java.util.Arrays;
/**