Fix import order for ViewPager code.

A follow up after factor to make it so androidx imports go in the
correct order.

Test: ./gradlew buildOnServer
Change-Id: I1dfa5677ef93dd14cb891a68cf42124edd39fafb

diff --git a/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtils.java b/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtils.java
index a6e08de..1b3a83a 100644
--- a/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtils.java
+++ b/viewpager/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/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsMatchers.java b/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsMatchers.java
index 024a5e2..0cdbf73 100644
--- a/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsMatchers.java
+++ b/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsMatchers.java

@@ -19,13 +19,14 @@
 import static org.junit.Assert.fail;
 
 import android.graphics.drawable.Drawable;
-import androidx.annotation.ColorInt;
 import android.support.test.espresso.matcher.BoundedMatcher;
-import androidx.core.view.ViewCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 
+import androidx.annotation.ColorInt;
+import androidx.core.view.ViewCompat;
+
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;

diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java
index 6970b19..c570822 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java

@@ -60,7 +60,6 @@
 import android.support.test.filters.MediumTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.v4.testutils.TestUtilsMatchers;
-import androidx.viewpager.test.R;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.view.KeyEvent;
@@ -70,6 +69,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.viewpager.test.R;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerActions.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerActions.java
index 1812d45..f12fcd3 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerActions.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerActions.java

@@ -16,7 +16,9 @@
 
 package androidx.viewpager.widget;
 
-import androidx.annotation.Nullable;
+import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
+
 import android.support.test.espresso.Espresso;
 import android.support.test.espresso.IdlingResource;
 import android.support.test.espresso.UiController;
@@ -27,10 +29,10 @@
 import android.support.test.espresso.action.Tap;
 import android.view.View;
 import android.widget.TextView;
-import org.hamcrest.Matcher;
 
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
+import androidx.annotation.Nullable;
+
+import org.hamcrest.Matcher;
 
 public class ViewPagerActions {
     /**

diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerTest.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerTest.java
index 9a1eacb..3b2bade 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerTest.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerTest.java

@@ -21,14 +21,15 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
 import android.support.test.rule.ActivityTestRule;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.junit.Rule;
 import org.junit.Test;
 

diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripActivity.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripActivity.java
index 47243e6..580f6ae2 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripActivity.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripActivity.java

@@ -18,9 +18,10 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import androidx.viewpager.test.R;
 import android.view.WindowManager;
 
+import androidx.viewpager.test.R;
+
 public class ViewPagerWithTabStripActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {

diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java
index 127d966..9dc7cfb 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java

@@ -15,8 +15,6 @@
  */
 package androidx.viewpager.widget;
 
-import androidx.viewpager.test.R;
-
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
@@ -26,6 +24,8 @@
 import static org.hamcrest.Matchers.allOf;
 import static org.junit.Assert.assertEquals;
 
+import androidx.viewpager.test.R;
+
 /**
  * Provides assertions that depend on the interactive nature of <code>PagerTabStrip</code>.
  */

diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripActivity.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripActivity.java
index 89730d1..237c59a 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripActivity.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripActivity.java

@@ -18,9 +18,10 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import androidx.viewpager.test.R;
 import android.view.WindowManager;
 
+import androidx.viewpager.test.R;
+
 public class ViewPagerWithTitleStripActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {

diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java
index b95f4b7..a4fc7b5 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java

@@ -15,8 +15,6 @@
  */
 package androidx.viewpager.widget;
 
-import androidx.viewpager.test.R;
-
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
@@ -26,6 +24,8 @@
 import static org.hamcrest.Matchers.allOf;
 import static org.junit.Assert.assertEquals;
 
+import androidx.viewpager.test.R;
+
 /**
  * Provides assertions that depend on the non-interactive nature of <code>PagerTabStrip</code>.
  */

diff --git a/viewpager/src/main/java/androidx/viewpager/widget/PagerAdapter.java b/viewpager/src/main/java/androidx/viewpager/widget/PagerAdapter.java
index a71f993..dd708c5 100644
--- a/viewpager/src/main/java/androidx/viewpager/widget/PagerAdapter.java
+++ b/viewpager/src/main/java/androidx/viewpager/widget/PagerAdapter.java

@@ -19,11 +19,12 @@
 import android.database.DataSetObservable;
 import android.database.DataSetObserver;
 import android.os.Parcelable;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * Base class providing the adapter to populate pages inside of
  * a {@link ViewPager}.  You will most likely want to use a more

diff --git a/viewpager/src/main/java/androidx/viewpager/widget/PagerTabStrip.java b/viewpager/src/main/java/androidx/viewpager/widget/PagerTabStrip.java
index fccde86..7cc989d 100644
--- a/viewpager/src/main/java/androidx/viewpager/widget/PagerTabStrip.java
+++ b/viewpager/src/main/java/androidx/viewpager/widget/PagerTabStrip.java

@@ -21,16 +21,17 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewConfiguration;
 
 /**
  * PagerTabStrip is an interactive indicator of the current, next,

diff --git a/viewpager/src/main/java/androidx/viewpager/widget/PagerTitleStrip.java b/viewpager/src/main/java/androidx/viewpager/widget/PagerTitleStrip.java
index 62746bb..d94fc09 100644
--- a/viewpager/src/main/java/androidx/viewpager/widget/PagerTitleStrip.java
+++ b/viewpager/src/main/java/androidx/viewpager/widget/PagerTitleStrip.java

@@ -20,11 +20,6 @@
 import android.content.res.TypedArray;
 import android.database.DataSetObserver;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.ColorInt;
-import androidx.annotation.FloatRange;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.widget.TextViewCompat;
 import android.text.TextUtils.TruncateAt;
 import android.text.method.SingleLineTransformationMethod;
 import android.util.AttributeSet;
@@ -35,6 +30,12 @@
 import android.view.ViewParent;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.widget.TextViewCompat;
+
 import java.lang.ref.WeakReference;
 import java.util.Locale;
 

diff --git a/viewpager/src/main/java/androidx/viewpager/widget/ViewPager.java b/viewpager/src/main/java/androidx/viewpager/widget/ViewPager.java
index 0d1063a..84da360 100644
--- a/viewpager/src/main/java/androidx/viewpager/widget/ViewPager.java
+++ b/viewpager/src/main/java/androidx/viewpager/widget/ViewPager.java

@@ -27,18 +27,6 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import androidx.annotation.CallSuper;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.Px;
-import androidx.core.content.ContextCompat;
-import androidx.customview.view.AbsSavedState;
-import androidx.core.view.AccessibilityDelegateCompat;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-import androidx.core.view.accessibility.AccessibilityEventCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.FocusFinder;
@@ -56,6 +44,19 @@
 import android.widget.EdgeEffect;
 import android.widget.Scroller;
 
+import androidx.annotation.CallSuper;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+import androidx.core.view.accessibility.AccessibilityEventCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.customview.view.AbsSavedState;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;

diff --git a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/tests/TestActivity.java b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/tests/TestActivity.java
index 46c63dc..78926cf 100644
--- a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/tests/TestActivity.java
+++ b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/tests/TestActivity.java

@@ -17,8 +17,8 @@
 package androidx.viewpager2.widget.tests;
 
 import android.os.Bundle;
-import androidx.fragment.app.FragmentActivity;
 
+import androidx.fragment.app.FragmentActivity;
 import androidx.viewpager2.test.R;
 import androidx.viewpager2.widget.ViewPager2;
 

diff --git a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/tests/ViewPager2Tests.java b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/tests/ViewPager2Tests.java
index de2dfb3..fae008d4 100644
--- a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/tests/ViewPager2Tests.java
+++ b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/tests/ViewPager2Tests.java

@@ -21,9 +21,10 @@
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
 import static android.view.View.OVER_SCROLL_NEVER;
 
+import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@@ -34,20 +35,12 @@
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.espresso.ViewAction;
 import android.support.test.espresso.action.ViewActions;
 import android.support.test.filters.MediumTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.core.util.Preconditions;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.Adapter;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -55,6 +48,17 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Preconditions;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+import androidx.viewpager2.test.R;
+import androidx.viewpager2.widget.ViewPager2;
+
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -72,9 +76,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import androidx.viewpager2.test.R;
-import androidx.viewpager2.widget.ViewPager2;
-
 @MediumTest
 @RunWith(AndroidJUnit4.class)
 public class ViewPager2Tests {

diff --git a/viewpager2/src/main/java/androidx/viewpager2/widget/ViewPager2.java b/viewpager2/src/main/java/androidx/viewpager2/widget/ViewPager2.java
index 4b0e46de..2bb0e30 100644
--- a/viewpager2/src/main/java/androidx/viewpager2/widget/ViewPager2.java
+++ b/viewpager2/src/main/java/androidx/viewpager2/widget/ViewPager2.java

@@ -22,26 +22,27 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.RestrictTo;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.core.view.ViewCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.PagerSnapHelper;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.Adapter;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.PagerSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
 import java.lang.annotation.Retention;
 import java.util.ArrayList;
 import java.util.List;