Merge changes If022a8f1,Ibb836331,I106d2eba,Ie2541f80,I430f47de into pi-preview1-androidx-dev
am: 268b6f5307
Change-Id: I73091b335582596deb3b65335cb020c03a0c62cb
diff --git a/legacy/core-ui/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java b/legacy/core-ui/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java
index 3150ec4..878b5be 100644
--- a/legacy/core-ui/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java
+++ b/legacy/core-ui/src/main/java/androidx/legacy/app/ActionBarDrawerToggle.java
@@ -27,6 +27,12 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.InsetDrawable;
import android.os.Build;
+import android.util.Log;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -35,11 +41,6 @@
import androidx.core.view.GravityCompat;
import androidx.core.view.ViewCompat;
import androidx.drawerlayout.widget.DrawerLayout;
-import android.util.Log;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
import java.lang.reflect.Method;
diff --git a/legacy/core-ui/src/main/java/androidx/legacy/widget/Space.java b/legacy/core-ui/src/main/java/androidx/legacy/widget/Space.java
index 1613002..5221829 100644
--- a/legacy/core-ui/src/main/java/androidx/legacy/widget/Space.java
+++ b/legacy/core-ui/src/main/java/androidx/legacy/widget/Space.java
@@ -19,11 +19,12 @@
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Canvas;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
* Space is a lightweight {@link View} subclass that may be used to create gaps between components
* in general purpose layouts.
diff --git a/legacy/v13/src/main/java/androidx/legacy/app/FragmentCompat.java b/legacy/v13/src/main/java/androidx/legacy/app/FragmentCompat.java
index 6d4b786..34685ab 100644
--- a/legacy/v13/src/main/java/androidx/legacy/app/FragmentCompat.java
+++ b/legacy/v13/src/main/java/androidx/legacy/app/FragmentCompat.java
@@ -22,6 +22,7 @@
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
+
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
diff --git a/legacy/v13/src/main/java/androidx/legacy/app/FragmentPagerAdapter.java b/legacy/v13/src/main/java/androidx/legacy/app/FragmentPagerAdapter.java
index 4ab7801..130cd78 100644
--- a/legacy/v13/src/main/java/androidx/legacy/app/FragmentPagerAdapter.java
+++ b/legacy/v13/src/main/java/androidx/legacy/app/FragmentPagerAdapter.java
@@ -20,12 +20,13 @@
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.os.Parcelable;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.viewpager.widget.PagerAdapter;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+
/**
* Implementation of {@link PagerAdapter} that
* represents each page as a {@link android.app.Fragment} that is persistently
diff --git a/legacy/v13/src/main/java/androidx/legacy/app/FragmentStatePagerAdapter.java b/legacy/v13/src/main/java/androidx/legacy/app/FragmentStatePagerAdapter.java
index f0b137f..9324b13 100644
--- a/legacy/v13/src/main/java/androidx/legacy/app/FragmentStatePagerAdapter.java
+++ b/legacy/v13/src/main/java/androidx/legacy/app/FragmentStatePagerAdapter.java
@@ -21,12 +21,13 @@
import android.app.FragmentTransaction;
import android.os.Bundle;
import android.os.Parcelable;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.PagerAdapter;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+
import java.util.ArrayList;
/**
diff --git a/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java b/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
index 6cfbef5..c08f79e 100644
--- a/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
+++ b/mediarouter/jellybean-mr1/androidx/mediarouter/media/MediaRouterJellybeanMr1.java
@@ -20,10 +20,11 @@
import android.hardware.display.DisplayManager;
import android.os.Build;
import android.os.Handler;
-import androidx.annotation.RequiresApi;
import android.util.Log;
import android.view.Display;
+import androidx.annotation.RequiresApi;
+
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java b/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java
index 23642d1..c3f79e8 100644
--- a/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java
+++ b/mediarouter/jellybean/androidx/mediarouter/media/MediaRouterJellybean.java
@@ -20,9 +20,10 @@
import android.graphics.drawable.Drawable;
import android.media.AudioManager;
import android.os.Build;
-import androidx.annotation.RequiresApi;
import android.util.Log;
+import androidx.annotation.RequiresApi;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
diff --git a/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java b/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java
index aa16a33..aa4e9ef 100644
--- a/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java
+++ b/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java
@@ -25,6 +25,7 @@
import android.support.test.filters.SmallTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
+
import androidx.mediarouter.media.MediaRouter.RouteInfo;
import androidx.mediarouter.media.TestUtils;
import androidx.mediarouter.test.R;
diff --git a/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTestActivity.java b/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTestActivity.java
index 2649bf2..6f65479 100644
--- a/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTestActivity.java
+++ b/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTestActivity.java
@@ -17,6 +17,7 @@
package androidx.mediarouter.app;
import android.os.Bundle;
+
import androidx.appcompat.app.AppCompatActivity;
import androidx.mediarouter.test.R;
diff --git a/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java b/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java
index 4e663c0..46a8f28 100644
--- a/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java
+++ b/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java
@@ -18,14 +18,16 @@
import static android.support.test.InstrumentationRegistry.getContext;
import static android.support.test.InstrumentationRegistry.getInstrumentation;
+
import static org.junit.Assert.assertTrue;
import android.content.Context;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
-import androidx.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
+import androidx.media.session.MediaControllerCompat;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java
index e6fcf06..a9a8427 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteActionProvider.java
@@ -17,17 +17,18 @@
package androidx.mediarouter.app;
import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.view.ActionProvider;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.mediarouter.media.MediaRouteSelector;
-import androidx.mediarouter.media.MediaRouter;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.ActionProvider;
+import androidx.mediarouter.media.MediaRouteSelector;
+import androidx.mediarouter.media.MediaRouter;
+
import java.lang.ref.WeakReference;
/**
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
index 2557eb1..81bbbc4 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
@@ -25,20 +25,21 @@
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.mediarouter.media.MediaRouteSelector;
-import androidx.mediarouter.media.MediaRouter;
-import androidx.mediarouter.R;
-import androidx.appcompat.widget.TooltipCompat;
import android.util.AttributeSet;
import android.util.Log;
import android.util.SparseArray;
import android.view.SoundEffectConstants;
import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.TooltipCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.mediarouter.R;
+import androidx.mediarouter.media.MediaRouteSelector;
+import androidx.mediarouter.media.MediaRouter;
+
/**
* The media route button allows the user to select routes and to control the
* currently selected route.
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
index 3d8a278..bf76553 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialog.java
@@ -27,11 +27,6 @@
import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatDialog;
-import androidx.mediarouter.media.MediaRouteSelector;
-import androidx.mediarouter.media.MediaRouter;
-import androidx.mediarouter.R;
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
@@ -44,6 +39,12 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDialog;
+import androidx.mediarouter.R;
+import androidx.mediarouter.media.MediaRouteSelector;
+import androidx.mediarouter.media.MediaRouter;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialogFragment.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialogFragment.java
index c9295cb..df18df9 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialogFragment.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteChooserDialogFragment.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.content.res.Configuration;
import android.os.Bundle;
+
import androidx.fragment.app.DialogFragment;
import androidx.mediarouter.media.MediaRouteSelector;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java
index d9f396e..717dbe9 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialog.java
@@ -36,17 +36,8 @@
import android.os.SystemClock;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
-import androidx.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
-import androidx.core.util.ObjectsCompat;
-import androidx.core.view.accessibility.AccessibilityEventCompat;
-import androidx.appcompat.app.AlertDialog;
-
-import androidx.palette.graphics.Palette;
-import androidx.mediarouter.media.MediaRouteSelector;
-import androidx.mediarouter.media.MediaRouter;
-import androidx.mediarouter.R;
import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
@@ -75,6 +66,15 @@
import android.widget.SeekBar;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.util.ObjectsCompat;
+import androidx.core.view.accessibility.AccessibilityEventCompat;
+import androidx.media.session.MediaControllerCompat;
+import androidx.mediarouter.R;
+import androidx.mediarouter.media.MediaRouteSelector;
+import androidx.mediarouter.media.MediaRouter;
+import androidx.palette.graphics.Palette;
+
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialogFragment.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialogFragment.java
index 81a8273..3a7e2ef 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialogFragment.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteControllerDialogFragment.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.content.res.Configuration;
import android.os.Bundle;
+
import androidx.fragment.app.DialogFragment;
/**
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogHelper.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogHelper.java
index 76ca001..a418d5b 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogHelper.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDialogHelper.java
@@ -21,7 +21,6 @@
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
-import androidx.mediarouter.R;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.View;
@@ -29,6 +28,8 @@
import android.widget.ArrayAdapter;
import android.widget.ListView;
+import androidx.mediarouter.R;
+
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDiscoveryFragment.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDiscoveryFragment.java
index 63d92f7..33c7317 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDiscoveryFragment.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteDiscoveryFragment.java
@@ -17,9 +17,10 @@
package androidx.mediarouter.app;
import android.os.Bundle;
+
import androidx.fragment.app.Fragment;
-import androidx.mediarouter.media.MediaRouter;
import androidx.mediarouter.media.MediaRouteSelector;
+import androidx.mediarouter.media.MediaRouter;
/**
* Media route discovery fragment.
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java
index 931f9f0..5c5cf65 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteExpandCollapseButton.java
@@ -21,12 +21,13 @@
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.AnimationDrawable;
-import androidx.core.content.ContextCompat;
-import androidx.mediarouter.R;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageButton;
+import androidx.core.content.ContextCompat;
+import androidx.mediarouter.R;
+
/**
* Chevron/Caret button to expand/collapse group volume list with animation.
*/
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteVolumeSlider.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteVolumeSlider.java
index d8ae149..f8511c1 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteVolumeSlider.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteVolumeSlider.java
@@ -20,10 +20,11 @@
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
-import androidx.appcompat.widget.AppCompatSeekBar;
import android.util.AttributeSet;
import android.util.Log;
+import androidx.appcompat.widget.AppCompatSeekBar;
+
/**
* Volume slider with showing, hiding, and applying alpha supports to the thumb.
*/
diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java
index 26df71d..aebbb26 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouterThemeHelper.java
@@ -19,13 +19,14 @@
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
-import androidx.annotation.IntDef;
-import androidx.core.graphics.ColorUtils;
-import androidx.mediarouter.R;
import android.util.TypedValue;
import android.view.ContextThemeWrapper;
import android.view.View;
+import androidx.annotation.IntDef;
+import androidx.core.graphics.ColorUtils;
+import androidx.mediarouter.R;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java
index ac74e61..97d3f54 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/MediaItemStatus.java
@@ -19,6 +19,7 @@
import android.app.PendingIntent;
import android.os.Bundle;
import android.os.SystemClock;
+
import androidx.core.util.TimeUtils;
/**
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java
index 5358858..2eb80b3 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteDescriptor.java
@@ -21,9 +21,10 @@
import android.content.IntentSender;
import android.net.Uri;
import android.os.Bundle;
-import androidx.annotation.RestrictTo;
import android.text.TextUtils;
+import androidx.annotation.RestrictTo;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
index 2261a45..e7cc98b 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProvider.java
@@ -23,6 +23,7 @@
import android.content.Intent;
import android.os.Handler;
import android.os.Message;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java
index 15b42bc..bf56a81 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteProviderService.java
@@ -25,9 +25,11 @@
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_REGISTER;
import static androidx.mediarouter.media.MediaRouteProviderProtocol
.CLIENT_MSG_RELEASE_ROUTE_CONTROLLER;
-import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_ROUTE_CONTROL_REQUEST;
+import static androidx.mediarouter.media.MediaRouteProviderProtocol
+ .CLIENT_MSG_ROUTE_CONTROL_REQUEST;
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_SELECT_ROUTE;
-import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_SET_DISCOVERY_REQUEST;
+import static androidx.mediarouter.media.MediaRouteProviderProtocol
+ .CLIENT_MSG_SET_DISCOVERY_REQUEST;
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_SET_ROUTE_VOLUME;
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_UNREGISTER;
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_UNSELECT_ROUTE;
@@ -55,11 +57,12 @@
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.util.ObjectsCompat;
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.util.ObjectsCompat;
+
import java.lang.ref.WeakReference;
import java.util.ArrayList;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java
index 702501f..7221384 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouteSelector.java
@@ -17,6 +17,7 @@
import android.content.IntentFilter;
import android.os.Bundle;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java
index ce2519f..c73c01a 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/MediaRouter.java
@@ -32,20 +32,22 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
+import android.support.v4.media.session.MediaSessionCompat;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Display;
+
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.core.app.ActivityManagerCompat;
import androidx.core.hardware.display.DisplayManagerCompat;
-import androidx.media.VolumeProviderCompat;
-import android.support.v4.media.session.MediaSessionCompat;
import androidx.core.util.Pair;
+import androidx.media.VolumeProviderCompat;
+import androidx.mediarouter.app.MediaRouteDiscoveryFragment;
import androidx.mediarouter.media.MediaRouteProvider.ProviderMetadata;
import androidx.mediarouter.media.MediaRouteProvider.RouteController;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Display;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -60,8 +62,6 @@
import java.util.Map;
import java.util.Set;
-import androidx.mediarouter.app.MediaRouteDiscoveryFragment;
-
/**
* MediaRouter allows applications to control the routing of media channels
* and streams from the current device to external speakers and destination devices.
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java b/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java
index b289b95..94631c8 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/MediaSessionStatus.java
@@ -19,6 +19,7 @@
import android.app.PendingIntent;
import android.os.Bundle;
import android.os.SystemClock;
+
import androidx.core.util.TimeUtils;
/**
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java b/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java
index e252385..f345282 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/RegisteredMediaRouteProvider.java
@@ -25,9 +25,11 @@
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_REGISTER;
import static androidx.mediarouter.media.MediaRouteProviderProtocol
.CLIENT_MSG_RELEASE_ROUTE_CONTROLLER;
-import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_ROUTE_CONTROL_REQUEST;
+import static androidx.mediarouter.media.MediaRouteProviderProtocol
+ .CLIENT_MSG_ROUTE_CONTROL_REQUEST;
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_SELECT_ROUTE;
-import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_SET_DISCOVERY_REQUEST;
+import static androidx.mediarouter.media.MediaRouteProviderProtocol
+ .CLIENT_MSG_SET_DISCOVERY_REQUEST;
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_SET_ROUTE_VOLUME;
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_UNREGISTER;
import static androidx.mediarouter.media.MediaRouteProviderProtocol.CLIENT_MSG_UNSELECT_ROUTE;
@@ -57,11 +59,12 @@
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
-import androidx.annotation.NonNull;
-import androidx.mediarouter.media.MediaRouter.ControlRequestCallback;
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.NonNull;
+import androidx.mediarouter.media.MediaRouter.ControlRequestCallback;
+
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java b/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java
index 9603d5d..f006a82 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/RemoteControlClientCompat.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.media.AudioManager;
import android.os.Build;
+
import androidx.annotation.RequiresApi;
import java.lang.ref.WeakReference;
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java b/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java
index aeffa55..4295c5f 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/RemotePlaybackClient.java
@@ -22,9 +22,10 @@
import android.content.IntentFilter;
import android.net.Uri;
import android.os.Bundle;
-import androidx.core.util.ObjectsCompat;
import android.util.Log;
+import androidx.core.util.ObjectsCompat;
+
/**
* A helper class for playing media on remote routes using the remote playback protocol
* defined by {@link MediaControlIntent}.
diff --git a/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java b/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java
index 4bd5f36..b8ab169 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/media/SystemMediaRouteProvider.java
@@ -24,9 +24,10 @@
import android.content.res.Resources;
import android.media.AudioManager;
import android.os.Build;
+import android.view.Display;
+
import androidx.annotation.RequiresApi;
import androidx.mediarouter.R;
-import android.view.Display;
import java.util.ArrayList;
import java.util.List;
diff --git a/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java b/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
index fce5796..995cf3e 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
@@ -22,6 +22,7 @@
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.support.test.InstrumentationRegistry;
+
import androidx.palette.test.R;
class TestUtils {
diff --git a/palette/src/main/java/androidx/palette/graphics/ColorCutQuantizer.java b/palette/src/main/java/androidx/palette/graphics/ColorCutQuantizer.java
index e599b2b..5c304f8 100644
--- a/palette/src/main/java/androidx/palette/graphics/ColorCutQuantizer.java
+++ b/palette/src/main/java/androidx/palette/graphics/ColorCutQuantizer.java
@@ -17,9 +17,10 @@
package androidx.palette.graphics;
import android.graphics.Color;
-import androidx.core.graphics.ColorUtils;
import android.util.TimingLogger;
+import androidx.core.graphics.ColorUtils;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
diff --git a/palette/src/main/java/androidx/palette/graphics/Palette.java b/palette/src/main/java/androidx/palette/graphics/Palette.java
index 4b3192b..503149c 100644
--- a/palette/src/main/java/androidx/palette/graphics/Palette.java
+++ b/palette/src/main/java/androidx/palette/graphics/Palette.java
@@ -20,15 +20,16 @@
import android.graphics.Color;
import android.graphics.Rect;
import android.os.AsyncTask;
+import android.util.Log;
+import android.util.SparseBooleanArray;
+import android.util.TimingLogger;
+
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.Px;
-import androidx.core.graphics.ColorUtils;
import androidx.collection.ArrayMap;
-import android.util.Log;
-import android.util.SparseBooleanArray;
-import android.util.TimingLogger;
+import androidx.core.graphics.ColorUtils;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/LayoutDirectionActions.java b/percent/src/androidTest/java/androidx/percentlayout/widget/LayoutDirectionActions.java
index 4f9f3d6..839e2ce 100755
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/LayoutDirectionActions.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/LayoutDirectionActions.java
@@ -16,13 +16,15 @@
package androidx.percentlayout.widget;
+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/percent/src/androidTest/java/androidx/percentlayout/widget/PercentDynamicLayoutTest.java b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentDynamicLayoutTest.java
index ebf9e27..5a731e1 100755
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentDynamicLayoutTest.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentDynamicLayoutTest.java
@@ -22,8 +22,6 @@
import static org.hamcrest.CoreMatchers.allOf;
-import androidx.annotation.LayoutRes;
-import androidx.percentlayout.test.R;
import android.support.test.annotation.UiThreadTest;
import android.support.test.espresso.UiController;
import android.support.test.espresso.ViewAction;
@@ -31,6 +29,9 @@
import android.view.View;
import android.view.ViewStub;
+import androidx.annotation.LayoutRes;
+import androidx.percentlayout.test.R;
+
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentFrameTest.java b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentFrameTest.java
index 6ccaaf3..5a82552 100644
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentFrameTest.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentFrameTest.java
@@ -19,11 +19,12 @@
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import android.os.Build;
-import androidx.percentlayout.test.R;
import android.support.test.filters.SmallTest;
-import androidx.core.view.ViewCompat;
import android.view.View;
+import androidx.core.view.ViewCompat;
+import androidx.percentlayout.test.R;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeRtlTest.java b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeRtlTest.java
index 1e15eef..d322555 100644
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeRtlTest.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeRtlTest.java
@@ -19,11 +19,12 @@
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import android.os.Build;
-import androidx.percentlayout.test.R;
import android.support.test.filters.SmallTest;
-import androidx.core.view.ViewCompat;
import android.view.View;
+import androidx.core.view.ViewCompat;
+import androidx.percentlayout.test.R;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeTest.java b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeTest.java
index 39c1dde..63207f6 100644
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeTest.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeTest.java
@@ -15,10 +15,11 @@
*/
package androidx.percentlayout.widget;
-import androidx.percentlayout.test.R;
import android.support.test.filters.SmallTest;
import android.view.View;
+import androidx.percentlayout.test.R;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/percent/src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java b/percent/src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java
index 9fdef2e..01fdf36 100644
--- a/percent/src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java
+++ b/percent/src/main/java/androidx/percentlayout/widget/PercentFrameLayout.java
@@ -18,11 +18,12 @@
import android.content.Context;
import android.content.res.TypedArray;
-import androidx.annotation.RequiresApi;
import android.util.AttributeSet;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.annotation.RequiresApi;
+
/**
* Subclass of {@link android.widget.FrameLayout} that supports percentage based dimensions and
* margins.
diff --git a/percent/src/main/java/androidx/percentlayout/widget/PercentLayoutHelper.java b/percent/src/main/java/androidx/percentlayout/widget/PercentLayoutHelper.java
index 019f63c..bfef458 100644
--- a/percent/src/main/java/androidx/percentlayout/widget/PercentLayoutHelper.java
+++ b/percent/src/main/java/androidx/percentlayout/widget/PercentLayoutHelper.java
@@ -18,15 +18,16 @@
import android.content.Context;
import android.content.res.TypedArray;
-import androidx.annotation.NonNull;
-import androidx.percentlayout.R;
-import androidx.core.view.MarginLayoutParamsCompat;
-import androidx.core.view.ViewCompat;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.core.view.MarginLayoutParamsCompat;
+import androidx.core.view.ViewCompat;
+import androidx.percentlayout.R;
+
/**
* Helper for layouts that want to support percentage based dimensions.
*
diff --git a/print/src/main/java/androidx/print/PrintHelper.java b/print/src/main/java/androidx/print/PrintHelper.java
index 83c27a6..f32eb23 100644
--- a/print/src/main/java/androidx/print/PrintHelper.java
+++ b/print/src/main/java/androidx/print/PrintHelper.java
@@ -38,11 +38,12 @@
import android.print.PrintDocumentInfo;
import android.print.PrintManager;
import android.print.pdf.PrintedPdfDocument;
+import android.util.Log;
+
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
-import android.util.Log;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
diff --git a/recommendation/src/main/java/androidx/recommendation/app/ContentRecommendation.java b/recommendation/src/main/java/androidx/recommendation/app/ContentRecommendation.java
index 62db63f..d2a18fa 100644
--- a/recommendation/src/main/java/androidx/recommendation/app/ContentRecommendation.java
+++ b/recommendation/src/main/java/androidx/recommendation/app/ContentRecommendation.java
@@ -22,12 +22,13 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
+import android.text.TextUtils;
+
import androidx.annotation.ColorInt;
import androidx.annotation.DrawableRes;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import androidx.annotation.StringDef;
-import android.text.TextUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/CountingFragment.java b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/CountingFragment.java
index d52955b..0b64ff6 100644
--- a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/CountingFragment.java
+++ b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/CountingFragment.java
@@ -15,8 +15,6 @@
*/
package com.example.android.supportv13.app;
-import com.example.android.supportv13.R;
-
import android.app.Fragment;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -24,6 +22,8 @@
import android.view.ViewGroup;
import android.widget.TextView;
+import com.example.android.supportv13.R;
+
public class CountingFragment extends Fragment {
int mNum;
diff --git a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/CursorFragment.java b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/CursorFragment.java
index ee311fc..4bf3138 100644
--- a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/CursorFragment.java
+++ b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/CursorFragment.java
@@ -32,8 +32,8 @@
import android.view.View;
import android.widget.ListView;
import android.widget.SearchView;
-import android.widget.SimpleCursorAdapter;
import android.widget.SearchView.OnQueryTextListener;
+import android.widget.SimpleCursorAdapter;
public class CursorFragment extends ListFragment
diff --git a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentNestingPagerSupport.java b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentNestingPagerSupport.java
index d3c8db8..bb39400 100644
--- a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentNestingPagerSupport.java
+++ b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentNestingPagerSupport.java
@@ -15,10 +15,6 @@
*/
package com.example.android.supportv13.app;
-import java.util.ArrayList;
-
-import com.example.android.supportv13.R;
-
import android.app.ActionBar;
import android.app.ActionBar.Tab;
import android.app.Activity;
@@ -26,9 +22,14 @@
import android.app.FragmentTransaction;
import android.content.Context;
import android.os.Bundle;
+
import androidx.legacy.app.FragmentPagerAdapter;
import androidx.viewpager.widget.ViewPager;
+import com.example.android.supportv13.R;
+
+import java.util.ArrayList;
+
//BEGIN_INCLUDE(complete)
public class FragmentNestingPagerSupport extends Activity {
ViewPager mViewPager;
diff --git a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentNestingStatePagerSupport.java b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentNestingStatePagerSupport.java
index 76b4c3d..4e57648 100644
--- a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentNestingStatePagerSupport.java
+++ b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentNestingStatePagerSupport.java
@@ -22,6 +22,7 @@
import android.app.FragmentTransaction;
import android.content.Context;
import android.os.Bundle;
+
import androidx.legacy.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
diff --git a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentPagerSupport.java b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentPagerSupport.java
index 679c6fd..bba13ee 100644
--- a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentPagerSupport.java
+++ b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentPagerSupport.java
@@ -16,27 +16,27 @@
package com.example.android.supportv13.app;
-import com.example.android.supportv13.Cheeses;
-import com.example.android.supportv13.R;
-
-import androidx.legacy.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-
-import android.os.Bundle;
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.ListFragment;
+import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.view.View.OnClickListener;
+import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.ListView;
import android.widget.TextView;
+import androidx.legacy.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.example.android.supportv13.Cheeses;
+import com.example.android.supportv13.R;
+
//BEGIN_INCLUDE(complete)
public class FragmentPagerSupport extends Activity {
static final int NUM_ITEMS = 10;
diff --git a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentStatePagerSupport.java b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentStatePagerSupport.java
index 263087c..6180ae0 100644
--- a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentStatePagerSupport.java
+++ b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentStatePagerSupport.java
@@ -16,27 +16,27 @@
package com.example.android.supportv13.app;
-import com.example.android.supportv13.Cheeses;
-import com.example.android.supportv13.R;
-
-import androidx.legacy.app.FragmentStatePagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-
-import android.os.Bundle;
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.ListFragment;
+import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.view.View.OnClickListener;
+import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.ListView;
import android.widget.TextView;
+import androidx.legacy.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.example.android.supportv13.Cheeses;
+import com.example.android.supportv13.R;
+
//BEGIN_INCLUDE(complete)
public class FragmentStatePagerSupport extends Activity {
static final int NUM_ITEMS = 10;
diff --git a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentTabsFragment.java b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentTabsFragment.java
index c974393..5e432d0 100644
--- a/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentTabsFragment.java
+++ b/samples/Support13Demos/src/main/java/com/example/android/supportv13/app/FragmentTabsFragment.java
@@ -15,15 +15,16 @@
*/
package com.example.android.supportv13.app;
-import com.example.android.supportv13.R;
-
import android.app.Fragment;
import android.os.Bundle;
-import androidx.legacy.app.FragmentTabHost;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.legacy.app.FragmentTabHost;
+
+import com.example.android.supportv13.R;
+
public class FragmentTabsFragment extends Fragment {
private FragmentTabHost mTabHost;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java
index aac3ee1..bc37aa5 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityDelegateSupportActivity.java
@@ -19,13 +19,14 @@
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
-import androidx.core.view.AccessibilityDelegateCompat;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import android.util.AttributeSet;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
import com.example.android.supportv4.R;
/**
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java
index cc4d2b2..3dc78d2 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java
@@ -21,11 +21,12 @@
import android.app.Service;
import android.content.pm.ResolveInfo;
import android.os.Bundle;
-import androidx.core.accessibilityservice.AccessibilityServiceInfoCompat;
import android.view.accessibility.AccessibilityManager;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.core.accessibilityservice.AccessibilityServiceInfoCompat;
+
import com.example.android.supportv4.R;
import java.util.List;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityRoleDescriptionSupportActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityRoleDescriptionSupportActivity.java
index f9cc993..963690a 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityRoleDescriptionSupportActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/accessibility/AccessibilityRoleDescriptionSupportActivity.java
@@ -18,13 +18,14 @@
import android.app.Activity;
import android.os.Bundle;
-import androidx.core.view.AccessibilityDelegateCompat;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+
import com.example.android.supportv4.R;
/**
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java
index b9de822..781282b 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentAlertDialogSupport.java
@@ -16,11 +16,6 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.R;
-
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
-
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
@@ -31,6 +26,11 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+
+import com.example.android.supportv4.R;
+
/**
* Demonstrates how to show an AlertDialog that is managed by a Fragment.
*/
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java
index 7714add..d554f6a 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentArgumentsSupport.java
@@ -19,17 +19,18 @@
import android.content.Context;
import android.content.res.TypedArray;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.ViewCompat;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+
import com.example.android.supportv4.R;
/**
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java
index 4f0c3ca..a350afb 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentContextMenuSupport.java
@@ -16,11 +16,7 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.R;
-
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
import android.util.Log;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
@@ -30,6 +26,11 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
+import com.example.android.supportv4.R;
+
/**
* Demonstration of displaying a context menu from a fragment.
*/
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java
index 726cfc3..0938f4c 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentCustomAnimationSupport.java
@@ -17,11 +17,6 @@
package com.example.android.supportv4.app;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.ViewCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -29,6 +24,12 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+
import com.example.android.supportv4.R;
public class FragmentCustomAnimationSupport extends FragmentActivity {
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java
index fd6cb99..8048493 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentDialogOrActivitySupport.java
@@ -16,12 +16,7 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.R;
-
import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentTransaction;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -29,6 +24,12 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.example.android.supportv4.R;
+
public class FragmentDialogOrActivitySupport extends FragmentActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java
index 51885dc..57738e1 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentDialogSupport.java
@@ -16,13 +16,6 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.R;
-
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentTransaction;
-
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -31,6 +24,13 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.example.android.supportv4.R;
+
public class FragmentDialogSupport extends FragmentActivity {
int mStackLevel = 0;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java
index 0a3fc1e..448b4c4 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentHideShowSupport.java
@@ -16,20 +16,20 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.R;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
+import com.example.android.supportv4.R;
/**
* Demonstration of hiding and showing fragments.
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java
index 3337606..0c52bbe 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentLayoutSupport.java
@@ -16,14 +16,6 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.Shakespeare;
-import com.example.android.supportv4.R;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.fragment.app.ListFragment;
-
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
@@ -36,6 +28,14 @@
import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.fragment.app.ListFragment;
+
+import com.example.android.supportv4.R;
+import com.example.android.supportv4.Shakespeare;
+
/**
* Demonstration of using fragments to implement different activity layouts.
* This sample provides a different layout (and activity flow) when run in
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java
index 2ee3d52..0386557 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentListArraySupport.java
@@ -16,17 +16,17 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.Shakespeare;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.ListFragment;
-
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.ListView;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.ListFragment;
+
+import com.example.android.supportv4.Shakespeare;
+
/**
* Demonstration of using ListFragment to show a list of items
* from a canned array.
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java
index 80a8a35..260cbf8 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentMenuFragmentSupport.java
@@ -16,18 +16,18 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.R;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.CheckBox;
+import com.example.android.supportv4.R;
/**
* Demonstrates how fragments can participate in the options menu.
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java
index 746f03d..8fdefcb 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentMenuSupport.java
@@ -17,10 +17,6 @@
package com.example.android.supportv4.app;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -28,6 +24,11 @@
import android.view.View.OnClickListener;
import android.widget.CheckBox;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.example.android.supportv4.R;
/**
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentNestingTabsSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentNestingTabsSupport.java
index 380d376..0991eb8 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentNestingTabsSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentNestingTabsSupport.java
@@ -16,12 +16,14 @@
package com.example.android.supportv4.app;
//BEGIN_INCLUDE(complete)
-import com.example.android.supportv4.R;
import android.os.Bundle;
+
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTabHost;
+import com.example.android.supportv4.R;
+
public class FragmentNestingTabsSupport extends FragmentActivity {
private FragmentTabHost mTabHost;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java
index 82ecf80..fe203dd 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentPagerSupport.java
@@ -16,25 +16,26 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.Cheeses;
-import com.example.android.supportv4.R;
-
import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.TextView;
+
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.fragment.app.ListFragment;
import androidx.viewpager.widget.ViewPager;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.TextView;
+
+import com.example.android.supportv4.Cheeses;
+import com.example.android.supportv4.R;
//BEGIN_INCLUDE(complete)
public class FragmentPagerSupport extends FragmentActivity {
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java
index a921264..2e77355 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentReceiveResultSupport.java
@@ -20,9 +20,6 @@
import android.content.Intent;
import android.content.IntentSender;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentTransaction;
import android.text.Editable;
import android.view.LayoutInflater;
import android.view.View;
@@ -32,6 +29,10 @@
import android.widget.FrameLayout;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+
import com.example.android.supportv4.R;
public class FragmentReceiveResultSupport extends FragmentActivity {
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentRetainInstanceSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentRetainInstanceSupport.java
index 7d2b02d..3f86dd2 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentRetainInstanceSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentRetainInstanceSupport.java
@@ -16,19 +16,19 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.R;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ProgressBar;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.ProgressBar;
+import com.example.android.supportv4.R;
/**
* This example shows how you can use a Fragment to easily propagate state
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java
index 68edf67..abf1365 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStackFragmentSupport.java
@@ -17,14 +17,15 @@
package com.example.android.supportv4.app;
import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.Button;
import com.example.android.supportv4.R;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java
index 53cd3a4..d38af9a 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStackSupport.java
@@ -17,12 +17,6 @@
package com.example.android.supportv4.app;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.ViewCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -30,6 +24,13 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.example.android.supportv4.R;
public class FragmentStackSupport extends FragmentActivity {
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java
index de3a990..86f05cb 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentStatePagerSupport.java
@@ -16,6 +16,17 @@
package com.example.android.supportv4.app;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.TextView;
+
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
@@ -23,17 +34,6 @@
import androidx.fragment.app.ListFragment;
import androidx.viewpager.widget.ViewPager;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.TextView;
-
import com.example.android.supportv4.Cheeses;
import com.example.android.supportv4.R;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabs.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabs.java
index d2bfbca..c4bbd93 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabs.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabs.java
@@ -16,12 +16,14 @@
package com.example.android.supportv4.app;
//BEGIN_INCLUDE(complete)
-import com.example.android.supportv4.R;
import android.os.Bundle;
+
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTabHost;
+import com.example.android.supportv4.R;
+
/**
* This demonstrates how you can implement switching between the tabs of a
* TabHost through fragments, using FragmentTabHost.
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabsFragmentSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabsFragmentSupport.java
index 87d6d58..06a132b 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabsFragmentSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabsFragmentSupport.java
@@ -16,15 +16,17 @@
package com.example.android.supportv4.app;
//BEGIN_INCLUDE(complete)
-import com.example.android.supportv4.R;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTabHost;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTabHost;
+
+import com.example.android.supportv4.R;
+
public class FragmentTabsFragmentSupport extends Fragment {
private FragmentTabHost mTabHost;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java
index d2f2832..49c0b38 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/FragmentTabsPager.java
@@ -17,15 +17,16 @@
import android.content.Context;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TabHost;
import android.widget.TabWidget;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
import com.example.android.supportv4.R;
import java.util.ArrayList;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderCursorSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderCursorSupport.java
index e057e77..bc43b4e 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderCursorSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderCursorSupport.java
@@ -20,14 +20,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.Contacts.People;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.CursorLoader;
-import androidx.loader.content.Loader;
-import androidx.cursoradapter.widget.SimpleCursorAdapter;
import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
@@ -37,6 +29,15 @@
import android.widget.ListView;
import android.widget.SearchView;
+import androidx.annotation.NonNull;
+import androidx.cursoradapter.widget.SimpleCursorAdapter;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
/**
* Demonstration of the use of a CursorLoader to load and display contacts
* data in a fragment.
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java
index b7b6cfa..2886395 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderCustomSupport.java
@@ -27,14 +27,6 @@
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.AsyncTaskLoader;
-import androidx.core.content.ContextCompat;
-import androidx.loader.content.Loader;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -49,6 +41,15 @@
import android.widget.SearchView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.AsyncTaskLoader;
+import androidx.loader.content.Loader;
+
import com.example.android.supportv4.R;
import java.io.File;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderRetainedSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderRetainedSupport.java
index fa9adf5..1d814a1 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderRetainedSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderRetainedSupport.java
@@ -20,14 +20,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.Contacts.People;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.CursorLoader;
-import androidx.loader.content.Loader;
-import androidx.cursoradapter.widget.SimpleCursorAdapter;
import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
@@ -37,6 +29,15 @@
import android.widget.ListView;
import android.widget.SearchView;
+import androidx.annotation.NonNull;
+import androidx.cursoradapter.widget.SimpleCursorAdapter;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
/**
* Demonstration of the use of a CursorLoader to load and display contacts
* data in a fragment.
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java
index 27207e9..72d3e91 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/LoaderThrottleSupport.java
@@ -33,15 +33,6 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.provider.BaseColumns;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.CursorLoader;
-import androidx.loader.content.Loader;
-import androidx.core.database.DatabaseUtilsCompat;
-import androidx.cursoradapter.widget.SimpleCursorAdapter;
import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
@@ -50,6 +41,16 @@
import android.view.View;
import android.widget.ListView;
+import androidx.annotation.NonNull;
+import androidx.core.database.DatabaseUtilsCompat;
+import androidx.cursoradapter.widget.SimpleCursorAdapter;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
import java.util.HashMap;
/**
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SendResult.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SendResult.java
index 6495f1f..191c33a 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SendResult.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SendResult.java
@@ -18,7 +18,6 @@
// Need the following import to get access to the app resources, since this
// class is in a sub-package.
-import com.example.android.supportv4.R;
import android.app.Activity;
import android.content.Intent;
@@ -27,6 +26,8 @@
import android.view.View.OnClickListener;
import android.widget.Button;
+import com.example.android.supportv4.R;
+
/**
* Example of receiving a result from another activity.
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SharingReceiverSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SharingReceiverSupport.java
index 32ad383..67ce8d1 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SharingReceiverSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SharingReceiverSupport.java
@@ -16,16 +16,17 @@
package com.example.android.supportv4.app;
-import com.example.android.supportv4.R;
-
import android.app.Activity;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
-import androidx.core.app.ShareCompat;
import android.util.Log;
import android.widget.TextView;
+import androidx.core.app.ShareCompat;
+
+import com.example.android.supportv4.R;
+
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.IOException;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SharingSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SharingSupport.java
index 2199e6d..1462000 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SharingSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SharingSupport.java
@@ -19,11 +19,12 @@
import android.app.Activity;
import android.net.Uri;
import android.os.Bundle;
-import androidx.core.app.ShareCompat;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import androidx.core.app.ShareCompat;
+
import com.example.android.supportv4.R;
import com.example.android.supportv4.content.SharingSupportProvider;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SimpleJobIntentService.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SimpleJobIntentService.java
index 71e6b0a..a9b4604 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SimpleJobIntentService.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/app/SimpleJobIntentService.java
@@ -17,14 +17,16 @@
package com.example.android.supportv4.app;
//BEGIN_INCLUDE(complete)
+
import android.content.Context;
import android.content.Intent;
import android.os.Handler;
import android.os.SystemClock;
-import androidx.core.app.JobIntentService;
import android.util.Log;
import android.widget.Toast;
+import androidx.core.app.JobIntentService;
+
/**
* Example implementation of a JobIntentService.
*/
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/FileProviderExample.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/FileProviderExample.java
index 18bc9a5..ecf1559 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/FileProviderExample.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/FileProviderExample.java
@@ -15,15 +15,17 @@
*/
package com.example.android.supportv4.content;
+
import android.app.Activity;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.net.Uri;
import android.os.Bundle;
-import androidx.core.content.FileProvider;
import android.view.View;
+import androidx.core.content.FileProvider;
+
import com.example.android.supportv4.R;
import java.io.File;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java
index 30cab50..a23e148 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/LocalServiceBroadcaster.java
@@ -16,8 +16,6 @@
package com.example.android.supportv4.content;
-import com.example.android.supportv4.R;
-
import android.app.Activity;
import android.app.Service;
import android.content.BroadcastReceiver;
@@ -28,13 +26,16 @@
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
-import androidx.core.app.ServiceCompat;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
+import androidx.core.app.ServiceCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import com.example.android.supportv4.R;
+
/**
* Demonstrates the use of a LocalBroadcastManager to easily communicate
* data from a service to any other interested code.
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/SimpleWakefulController.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/SimpleWakefulController.java
index 78f46f2..804a3b8 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/SimpleWakefulController.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/SimpleWakefulController.java
@@ -16,8 +16,6 @@
package com.example.android.supportv4.content;
-import com.example.android.supportv4.R;
-
import android.app.Activity;
import android.app.AlarmManager;
import android.app.PendingIntent;
@@ -27,6 +25,8 @@
import android.widget.Button;
import android.widget.Toast;
+import com.example.android.supportv4.R;
+
import java.util.Calendar;
public class SimpleWakefulController extends Activity {
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/SimpleWakefulReceiver.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/SimpleWakefulReceiver.java
index ffa4d18..af9710d 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/SimpleWakefulReceiver.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/content/SimpleWakefulReceiver.java
@@ -17,12 +17,14 @@
package com.example.android.supportv4.content;
//BEGIN_INCLUDE(complete)
+
import android.content.Context;
import android.content.Intent;
import android.os.SystemClock;
-import androidx.legacy.content.WakefulBroadcastReceiver;
import android.util.Log;
+import androidx.legacy.content.WakefulBroadcastReceiver;
+
public class SimpleWakefulReceiver extends WakefulBroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java
index ff38bb3..47d8d96 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/graphics/DrawableCompatActivity.java
@@ -16,17 +16,18 @@
package com.example.android.supportv4.graphics;
-import com.example.android.supportv4.R;
-
import android.app.Activity;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
import android.widget.ImageView;
import android.widget.RadioGroup;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+import com.example.android.supportv4.R;
+
/**
* Demonstrates use of a {@link DrawableCompat}'s ability to become circular.
*/
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/graphics/RoundedBitmapDrawableActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/graphics/RoundedBitmapDrawableActivity.java
index 75e03fe..a91f7d3 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/graphics/RoundedBitmapDrawableActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/graphics/RoundedBitmapDrawableActivity.java
@@ -20,12 +20,13 @@
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle;
-import androidx.core.graphics.drawable.RoundedBitmapDrawable;
-import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.ToggleButton;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
import com.example.android.supportv4.R;
/**
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/AlbumArtCache.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/AlbumArtCache.java
index 268f63d..915dd58 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/AlbumArtCache.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/AlbumArtCache.java
@@ -18,10 +18,11 @@
import android.graphics.Bitmap;
import android.os.AsyncTask;
-import androidx.core.graphics.BitmapCompat;
-import androidx.collection.LruCache;
import android.util.Log;
+import androidx.collection.LruCache;
+import androidx.core.graphics.BitmapCompat;
+
import com.example.android.supportv4.media.utils.BitmapHelper;
import java.io.IOException;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/BrowseFragment.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/BrowseFragment.java
index 6b3c33f..aa53d49 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/BrowseFragment.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/BrowseFragment.java
@@ -19,10 +19,6 @@
import android.content.Context;
import android.os.Bundle;
import android.os.RemoteException;
-import androidx.fragment.app.Fragment;
-import androidx.core.content.ContextCompat;
-import androidx.media.MediaBrowserCompat;
-import androidx.media.session.MediaControllerCompat;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -35,6 +31,11 @@
import android.widget.TextView;
import android.widget.Toast;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.media.MediaBrowserCompat;
+import androidx.media.session.MediaControllerCompat;
+
import com.example.android.supportv4.R;
import java.util.ArrayList;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java
index e7bf284..0e6701e 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaBrowserServiceSupport.java
@@ -29,17 +29,18 @@
import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
-import androidx.media.MediaBrowserCompat;
-import androidx.media.MediaBrowserCompat.MediaItem;
-import androidx.media.MediaBrowserServiceCompat;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
-import androidx.media.session.MediaButtonReceiver;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.text.TextUtils;
import android.util.Log;
+import androidx.media.MediaBrowserCompat;
+import androidx.media.MediaBrowserCompat.MediaItem;
+import androidx.media.MediaBrowserServiceCompat;
+import androidx.media.session.MediaButtonReceiver;
+
import com.example.android.supportv4.R;
import com.example.android.supportv4.media.model.MusicProvider;
import com.example.android.supportv4.media.utils.CarHelper;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java
index 18823dc..bf8e27c 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaBrowserSupport.java
@@ -17,6 +17,7 @@
package com.example.android.supportv4.media;
import android.os.Bundle;
+
import androidx.fragment.app.FragmentActivity;
import androidx.media.MediaBrowserCompat;
import androidx.media.session.MediaControllerCompat;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java
index 2ab6084..5a118e6 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/MediaNotificationManager.java
@@ -26,15 +26,16 @@
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.os.RemoteException;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
-import androidx.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.util.Log;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.media.session.MediaControllerCompat;
+
import com.example.android.supportv4.R;
import com.example.android.supportv4.media.utils.ResourceHelper;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/Playback.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/Playback.java
index 62c236f..ed0af60 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/Playback.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/Playback.java
@@ -16,6 +16,12 @@
package com.example.android.supportv4.media;
+import static android.media.MediaPlayer.OnCompletionListener;
+import static android.media.MediaPlayer.OnErrorListener;
+import static android.media.MediaPlayer.OnPreparedListener;
+import static android.media.MediaPlayer.OnSeekCompleteListener;
+import static android.support.v4.media.session.MediaSessionCompat.QueueItem;
+
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -34,12 +40,6 @@
import java.io.IOException;
-import static android.media.MediaPlayer.OnCompletionListener;
-import static android.media.MediaPlayer.OnErrorListener;
-import static android.media.MediaPlayer.OnPreparedListener;
-import static android.media.MediaPlayer.OnSeekCompleteListener;
-import static android.support.v4.media.session.MediaSessionCompat.QueueItem;
-
/**
* A class that implements local media playback using {@link android.media.MediaPlayer}
*/
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/QueueAdapter.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/QueueAdapter.java
index 9cb07f1..f4c6df9 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/QueueAdapter.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/QueueAdapter.java
@@ -17,7 +17,6 @@
package com.example.android.supportv4.media;
import android.app.Activity;
-import androidx.core.content.ContextCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.view.LayoutInflater;
import android.view.View;
@@ -26,6 +25,8 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+
import com.example.android.supportv4.R;
import java.util.ArrayList;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/QueueFragment.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/QueueFragment.java
index 11beadb..55e54c8 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/QueueFragment.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/QueueFragment.java
@@ -19,10 +19,6 @@
import android.content.ComponentName;
import android.os.Bundle;
import android.os.RemoteException;
-import androidx.fragment.app.Fragment;
-import androidx.core.content.ContextCompat;
-import androidx.media.MediaBrowserCompat;
-import androidx.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.util.Log;
@@ -33,6 +29,11 @@
import android.widget.ImageButton;
import android.widget.ListView;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.media.MediaBrowserCompat;
+import androidx.media.session.MediaControllerCompat;
+
import com.example.android.supportv4.R;
import java.util.List;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java
index b78a195..01bd947 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/media/utils/QueueHelper.java
@@ -16,6 +16,9 @@
package com.example.android.supportv4.media.utils;
+import static com.example.android.supportv4.media.utils.MediaIDHelper.MEDIA_ID_MUSICS_BY_GENRE;
+import static com.example.android.supportv4.media.utils.MediaIDHelper.MEDIA_ID_MUSICS_BY_SEARCH;
+
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.util.Log;
@@ -27,9 +30,6 @@
import java.util.Iterator;
import java.util.List;
-import static com.example.android.supportv4.media.utils.MediaIDHelper.MEDIA_ID_MUSICS_BY_GENRE;
-import static com.example.android.supportv4.media.utils.MediaIDHelper.MEDIA_ID_MUSICS_BY_SEARCH;
-
/**
* Utility class to help on queue related tasks.
*/
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/text/BidiFormatterSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/text/BidiFormatterSupport.java
index 83036d8..a21e350 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/text/BidiFormatterSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/text/BidiFormatterSupport.java
@@ -18,9 +18,10 @@
import android.app.Activity;
import android.os.Bundle;
+import android.widget.TextView;
import androidx.core.text.BidiFormatter;
-import android.widget.TextView;
+
import com.example.android.supportv4.R;
/**
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java
index 32fbce9..9cdc294 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/CheckableFrameLayout.java
@@ -18,11 +18,12 @@
import android.content.Context;
import android.graphics.drawable.ColorDrawable;
-import androidx.core.view.ViewCompat;
import android.util.AttributeSet;
import android.widget.Checkable;
import android.widget.FrameLayout;
+import androidx.core.view.ViewCompat;
+
public class CheckableFrameLayout extends FrameLayout implements Checkable {
private boolean mChecked;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/ViewPagerActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/ViewPagerActivity.java
index 3e40b40..d38fb6f 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/ViewPagerActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/ViewPagerActivity.java
@@ -19,13 +19,14 @@
import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
-import androidx.viewpager.widget.PagerAdapter;
-import androidx.viewpager.widget.PagerTitleStrip;
-import androidx.viewpager.widget.ViewPager;
import android.util.Pair;
import android.view.View;
import android.view.ViewGroup;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.PagerTitleStrip;
+import androidx.viewpager.widget.ViewPager;
+
import com.example.android.supportv4.R;
import java.util.ArrayList;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java
index bc3917f..ec1dca2 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/view/inputmethod/CommitContentSupport.java
@@ -21,9 +21,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.Parcelable;
-import androidx.core.view.inputmethod.EditorInfoCompat;
-import androidx.core.view.inputmethod.InputConnectionCompat;
-import androidx.core.view.inputmethod.InputContentInfoCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.inputmethod.EditorInfo;
@@ -33,6 +30,10 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.core.view.inputmethod.EditorInfoCompat;
+import androidx.core.view.inputmethod.InputConnectionCompat;
+import androidx.core.view.inputmethod.InputContentInfoCompat;
+
import com.example.android.supportv4.R;
import java.util.ArrayList;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/BaseSwipeRefreshLayoutActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/BaseSwipeRefreshLayoutActivity.java
index e95ef35..c6cf997 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/BaseSwipeRefreshLayoutActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/BaseSwipeRefreshLayoutActivity.java
@@ -19,13 +19,14 @@
import android.app.Activity;
import android.os.Bundle;
import android.os.Handler;
-import androidx.annotation.LayoutRes;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.annotation.LayoutRes;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener;
+
import com.example.android.supportv4.R;
/**
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/ContentLoadingProgressBarActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/ContentLoadingProgressBarActivity.java
index 96e2eee..0133412 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/ContentLoadingProgressBarActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/ContentLoadingProgressBarActivity.java
@@ -18,13 +18,14 @@
import android.app.Activity;
import android.os.Bundle;
-import androidx.core.widget.ContentLoadingProgressBar;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewTreeObserver;
import android.widget.Button;
import android.widget.TextView;
+import androidx.core.widget.ContentLoadingProgressBar;
+
import com.example.android.supportv4.R;
/**
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java
index cfc11fa..f54bad9 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/ExploreByTouchHelperActivity.java
@@ -26,15 +26,16 @@
import android.graphics.Rect;
import android.graphics.RectF;
import android.os.Bundle;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
-import androidx.customview.widget.ExploreByTouchHelper;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
+
import com.example.android.supportv4.R;
import java.util.ArrayList;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/SlidingPaneLayoutActivity.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/SlidingPaneLayoutActivity.java
index 3ed2e1f..9c6a3c1 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/SlidingPaneLayoutActivity.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/SlidingPaneLayoutActivity.java
@@ -21,7 +21,6 @@
import android.app.Activity;
import android.os.Build;
import android.os.Bundle;
-import androidx.slidingpanelayout.widget.SlidingPaneLayout;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewTreeObserver;
@@ -30,6 +29,8 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.slidingpanelayout.widget.SlidingPaneLayout;
+
import com.example.android.supportv4.R;
import com.example.android.supportv4.Shakespeare;
diff --git a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/SwipeRefreshLayoutActivityList.java b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/SwipeRefreshLayoutActivityList.java
index 8d6bef3..7dae1a8 100644
--- a/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/SwipeRefreshLayoutActivityList.java
+++ b/samples/Support4Demos/src/main/java/com/example/android/supportv4/widget/SwipeRefreshLayoutActivityList.java
@@ -16,12 +16,12 @@
package com.example.android.supportv4.widget;
-import com.example.android.supportv4.R;
-
import android.os.Bundle;
import android.widget.ArrayAdapter;
import android.widget.ListView;
+import com.example.android.supportv4.R;
+
public class SwipeRefreshLayoutActivityList extends BaseSwipeRefreshLayoutActivity {
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarActionMode.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarActionMode.java
index 5f7af13..ace3d00 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarActionMode.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarActionMode.java
@@ -17,13 +17,14 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.view.ActionMode;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java
index 1995a92..7855921 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarDisplayOptions.java
@@ -16,16 +16,17 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.ActionBar.Tab;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.Gravity;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.ArrayAdapter;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.ActionBar.Tab;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java
index cc41e53..6fb369a 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarFragmentMenu.java
@@ -17,10 +17,6 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -29,6 +25,11 @@
import android.widget.CheckBox;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarHideOnScroll.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarHideOnScroll.java
index e6cc678..fa0a049 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarHideOnScroll.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarHideOnScroll.java
@@ -15,11 +15,12 @@
*/
package com.example.android.supportv7.app;
-import com.example.android.supportv7.R;
-
import android.os.Bundle;
-import androidx.core.view.WindowCompat;
+
import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.WindowCompat;
+
+import com.example.android.supportv7.R;
/**
* This demonstrates usage of the Action Bar's hide on content scroll
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarMechanics.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarMechanics.java
index b5bd113..d31f0b0 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarMechanics.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarMechanics.java
@@ -16,12 +16,13 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
-import androidx.core.view.WindowCompat;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.WindowCompat;
+
/**
* This demonstrates the basics of the Action Bar and how it interoperates with the
* standard options menu. This demo is for informative purposes only; see ActionBarUsage for
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarPreferences.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarPreferences.java
index 810e615..6d03798 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarPreferences.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarPreferences.java
@@ -15,13 +15,13 @@
*/
package com.example.android.supportv7.app;
-import com.example.android.supportv7.R;
-
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;
+import com.example.android.supportv7.R;
+
/**
* This demonstrates how to use our custom AppCompat {@link android.preference.PreferenceActivity}.
*/
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java
index 165b5fc..066be1e 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java
@@ -16,13 +16,9 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.R;
-
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
-import androidx.core.view.ActionProvider;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@@ -30,6 +26,11 @@
import android.widget.ImageButton;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.ActionProvider;
+
+import com.example.android.supportv7.R;
+
/**
* This activity demonstrates how to implement an {@link android.view.ActionProvider}
* for adding functionality to the Action Bar. In particular this demo creates an
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarShareActionProvider.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarShareActionProvider.java
index 7b5bf00..5c31698 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarShareActionProvider.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarShareActionProvider.java
@@ -16,15 +16,16 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.R;
-
import android.content.Intent;
-import androidx.core.view.MenuItemCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.ShareActionProvider;
import android.view.Menu;
import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.ShareActionProvider;
+import androidx.core.view.MenuItemCompat;
+
+import com.example.android.supportv7.R;
+
/**
* This activity demonstrates how to use {@link ShareActionProvider} with the Action Bar.
*/
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarUsage.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarUsage.java
index ee00915..0a4b4a5 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarUsage.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ActionBarUsage.java
@@ -17,9 +17,6 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.core.view.MenuItemCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.SearchView;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuInflater;
@@ -27,6 +24,10 @@
import android.widget.TextView;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AlertDialogUsage.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AlertDialogUsage.java
index d10f354..866c247 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AlertDialogUsage.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AlertDialogUsage.java
@@ -16,15 +16,16 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.Cheeses;
-import com.example.android.supportv7.R;
-
import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.Spinner;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.android.supportv7.Cheeses;
+import com.example.android.supportv7.R;
+
/**
* This demonstrates idiomatic usage of AppCompat's AlertDialog.
*/
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatAnimatedVector.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatAnimatedVector.java
index 8b54c8b..1533763 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatAnimatedVector.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatAnimatedVector.java
@@ -16,14 +16,15 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.R;
-
import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
import android.widget.ImageView;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.android.supportv7.R;
+
public class AppCompatAnimatedVector extends AppCompatActivity {
@Override
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeActivity.java
index 58b4ba3..87707bd 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeActivity.java
@@ -17,13 +17,14 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.R;
-
import android.os.Bundle;
+import android.view.View;
+
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
-import android.view.View;
+
+import com.example.android.supportv7.R;
/**
* This demonstrates idiomatic usage of AppCompatActivity with Theme.AppCompat.DayNight
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java
index dae45b0..efbd1ea 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeAlertDialog.java
@@ -16,11 +16,12 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
+import android.view.View;
+
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
-import android.view.View;
import com.example.android.supportv7.R;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java
index af3c91b..8d1fe32 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatNightModeDialog.java
@@ -16,11 +16,12 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
+import android.view.View;
+
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.app.AppCompatDialog;
-import android.view.View;
import com.example.android.supportv7.R;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatPreferenceActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatPreferenceActivity.java
index 1925e2d..f9aea88 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatPreferenceActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatPreferenceActivity.java
@@ -19,14 +19,15 @@
import android.content.res.Configuration;
import android.os.Bundle;
import android.preference.PreferenceActivity;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
import androidx.annotation.LayoutRes;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.Toolbar;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
/**
* A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsButtons.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsButtons.java
index 9682a70..58077b9 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsButtons.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsButtons.java
@@ -16,11 +16,12 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.R;
-
import android.os.Bundle;
+
import androidx.appcompat.app.AppCompatActivity;
+import com.example.android.supportv7.R;
+
/**
* This demonstrates the styled {@link android.widget.Button} widgets in AppCompat.
*/
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsSpinners.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsSpinners.java
index 5e2db4d..cbd01a0 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsSpinners.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsSpinners.java
@@ -16,14 +16,15 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.Cheeses;
-import com.example.android.supportv7.R;
-
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
import android.widget.ArrayAdapter;
import android.widget.Spinner;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.android.supportv7.Cheeses;
+import com.example.android.supportv7.R;
+
/**
* This demonstrates the styled {@link android.widget.Spinner} widgets in AppCompat.
*/
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextInput.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextInput.java
index 8f07115..0a76053 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextInput.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextInput.java
@@ -16,15 +16,16 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.Cheeses;
-import com.example.android.supportv7.R;
-
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import android.widget.MultiAutoCompleteTextView;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.android.supportv7.Cheeses;
+import com.example.android.supportv7.R;
+
/**
* This demonstrates the styled text input widgets in AppCompat, such as
* {@link android.widget.EditText}, {@link android.widget.AutoCompleteTextView} and
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextViews.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextViews.java
index c104282..a76b1aa 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextViews.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/AppCompatWidgetsTextViews.java
@@ -17,6 +17,7 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
+
import androidx.appcompat.app.AppCompatActivity;
import com.example.android.supportv7.R;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java
index 33cdc07..aa5c6d7 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/DialogFragmentUsage.java
@@ -16,10 +16,6 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDialog;
-import androidx.appcompat.app.AppCompatDialogFragment;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -29,6 +25,11 @@
import android.widget.Spinner;
import android.widget.Toast;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/DialogUsage.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/DialogUsage.java
index 104304c..c06760c 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/DialogUsage.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/DialogUsage.java
@@ -18,14 +18,15 @@
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDialog;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Spinner;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDialog;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/MenuItemIconTinting.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/MenuItemIconTinting.java
index f684126..903adc4 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/MenuItemIconTinting.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/MenuItemIconTinting.java
@@ -16,13 +16,14 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarActionMode.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarActionMode.java
index 6331080..c670ff4 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarActionMode.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarActionMode.java
@@ -16,17 +16,18 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.R;
-
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.view.ActionMode;
-import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.appcompat.widget.Toolbar;
+
+import com.example.android.supportv7.R;
+
/**
* This demonstrates idiomatic usage of an action mode with a Toolbar.
*/
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarDisplayOptions.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarDisplayOptions.java
index 5c3250d..2aae200 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarDisplayOptions.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarDisplayOptions.java
@@ -16,17 +16,18 @@
package com.example.android.supportv7.app;
-import com.example.android.supportv7.R;
-
import android.os.Bundle;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import android.view.Gravity;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import com.example.android.supportv7.R;
+
/**
* This demo shows how various action bar display option flags can be combined and their effects
* when used on a Toolbar-provided Action Bar
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java
index a37f4d6..f442f41 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarFragmentPagerMenu.java
@@ -17,13 +17,6 @@
package com.example.android.supportv7.app;
import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -34,6 +27,14 @@
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
import com.example.android.supportv7.R;
import java.util.ArrayList;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarUsage.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarUsage.java
index 0379677..91034f4 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarUsage.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/app/ToolbarUsage.java
@@ -17,14 +17,15 @@
import android.app.SearchManager;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/ImageLoader.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/ImageLoader.java
index 9e50e48..9c3e67a 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/ImageLoader.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/ImageLoader.java
@@ -19,10 +19,11 @@
import android.graphics.Bitmap;
import android.os.AsyncTask;
import android.provider.MediaStore;
-import androidx.core.graphics.BitmapCompat;
-import androidx.collection.LruCache;
import android.widget.ImageView;
+import androidx.collection.LruCache;
+import androidx.core.graphics.BitmapCompat;
+
/**
* A very naive lazily implemented image loader. Do not use this in production code.
*/
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java
index 9551741..c19f082 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/PaletteActivity.java
@@ -23,15 +23,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.MediaStore;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.CursorLoader;
-import androidx.loader.content.Loader;
-import androidx.core.view.ViewCompat;
-import androidx.cursoradapter.widget.ResourceCursorAdapter;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.palette.graphics.Palette;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -39,6 +30,16 @@
import android.widget.ImageView;
import android.widget.ListView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.ViewCompat;
+import androidx.cursoradapter.widget.ResourceCursorAdapter;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+import androidx.palette.graphics.Palette;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java
index ad240d9..01adffb 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/graphics/PaletteDetailActivity.java
@@ -16,13 +16,9 @@
package com.example.android.supportv7.graphics;
-import com.example.android.supportv7.R;
-
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.palette.graphics.Palette;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -33,6 +29,11 @@
import android.widget.ImageView;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.palette.graphics.Palette;
+
+import com.example.android.supportv7.R;
+
import java.util.List;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/LocalPlayer.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/LocalPlayer.java
index e65ee00..ff95b0c 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/LocalPlayer.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/LocalPlayer.java
@@ -26,9 +26,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
-import androidx.annotation.RequiresApi;
-import androidx.mediarouter.media.MediaItemStatus;
-import androidx.mediarouter.media.MediaRouter.RouteInfo;
import android.util.Log;
import android.view.Display;
import android.view.Gravity;
@@ -40,6 +37,10 @@
import android.view.WindowManager;
import android.widget.FrameLayout;
+import androidx.annotation.RequiresApi;
+import androidx.mediarouter.media.MediaItemStatus;
+import androidx.mediarouter.media.MediaRouter.RouteInfo;
+
import com.example.android.supportv7.R;
import java.io.IOException;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java
index 0f38a21..fa4c885 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/MyMediaRouteControllerDialog.java
@@ -16,13 +16,14 @@
package com.example.android.supportv7.media;
+import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
-import androidx.mediarouter.app.MediaRouteControllerDialog;
-
-import android.content.Context;
import android.view.View;
import android.widget.TextView;
+
+import androidx.mediarouter.app.MediaRouteControllerDialog;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java
index db909ef..89a4052 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/OverlayDisplayWindow.java
@@ -21,7 +21,6 @@
import android.graphics.SurfaceTexture;
import android.hardware.display.DisplayManager;
import android.os.Build;
-import androidx.annotation.RequiresApi;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Display;
@@ -39,6 +38,8 @@
import android.view.WindowManager;
import android.widget.TextView;
+import androidx.annotation.RequiresApi;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/Player.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/Player.java
index 749ce4c..8d8ff3a 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/Player.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/Player.java
@@ -19,13 +19,14 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.os.Build;
-import androidx.annotation.RequiresApi;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
+import android.util.Log;
+
+import androidx.annotation.RequiresApi;
import androidx.mediarouter.media.MediaControlIntent;
import androidx.mediarouter.media.MediaRouter.RouteInfo;
-import android.util.Log;
/**
* Abstraction of common playback operations of media items, such as play,
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/PlaylistItem.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/PlaylistItem.java
index 85d2890..05fe5a5 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/PlaylistItem.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/PlaylistItem.java
@@ -19,6 +19,7 @@
import android.app.PendingIntent;
import android.net.Uri;
import android.os.SystemClock;
+
import androidx.mediarouter.media.MediaItemStatus;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/RemotePlayer.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/RemotePlayer.java
index e806d67..9c42fae 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/RemotePlayer.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/RemotePlayer.java
@@ -20,6 +20,8 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
+import android.util.Log;
+
import androidx.mediarouter.media.MediaItemStatus;
import androidx.mediarouter.media.MediaRouter.ControlRequestCallback;
import androidx.mediarouter.media.MediaRouter.RouteInfo;
@@ -28,7 +30,6 @@
import androidx.mediarouter.media.RemotePlaybackClient.ItemActionCallback;
import androidx.mediarouter.media.RemotePlaybackClient.SessionActionCallback;
import androidx.mediarouter.media.RemotePlaybackClient.StatusCallback;
-import android.util.Log;
import java.util.ArrayList;
import java.util.List;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaButtonReceiver.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaButtonReceiver.java
index d356446..77e5126 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaButtonReceiver.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaButtonReceiver.java
@@ -16,9 +16,9 @@
package com.example.android.supportv7.media;
+import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import android.content.BroadcastReceiver;
import android.view.KeyEvent;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java
index 2e233eb..58a56a3 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaRouteProvider.java
@@ -27,13 +27,14 @@
import android.media.MediaRouter;
import android.net.Uri;
import android.os.Bundle;
+import android.util.Log;
+
import androidx.mediarouter.media.MediaControlIntent;
import androidx.mediarouter.media.MediaRouteDescriptor;
import androidx.mediarouter.media.MediaRouteProvider;
import androidx.mediarouter.media.MediaRouteProviderDescriptor;
import androidx.mediarouter.media.MediaRouter.ControlRequestCallback;
import androidx.mediarouter.media.MediaSessionStatus;
-import android.util.Log;
import com.example.android.supportv7.R;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java
index 597c37a..f0b0c0e 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SampleMediaRouterActivity.java
@@ -30,22 +30,7 @@
import android.os.Handler;
import android.os.SystemClock;
import android.provider.Settings;
-import androidx.fragment.app.FragmentManager;
import android.support.v4.media.session.MediaSessionCompat;
-import androidx.core.view.MenuItemCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.mediarouter.app.MediaRouteActionProvider;
-import androidx.mediarouter.app.MediaRouteControllerDialog;
-import androidx.mediarouter.app.MediaRouteControllerDialogFragment;
-import androidx.mediarouter.app.MediaRouteDialogFactory;
-import androidx.mediarouter.app.MediaRouteDiscoveryFragment;
-import androidx.mediarouter.media.MediaControlIntent;
-import androidx.mediarouter.media.MediaItemStatus;
-import androidx.mediarouter.media.MediaRouteSelector;
-import androidx.mediarouter.media.MediaRouter;
-import androidx.mediarouter.media.MediaRouter.Callback;
-import androidx.mediarouter.media.MediaRouter.ProviderInfo;
-import androidx.mediarouter.media.MediaRouter.RouteInfo;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
@@ -66,6 +51,22 @@
import android.widget.TabHost.TabSpec;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.MenuItemCompat;
+import androidx.fragment.app.FragmentManager;
+import androidx.mediarouter.app.MediaRouteActionProvider;
+import androidx.mediarouter.app.MediaRouteControllerDialog;
+import androidx.mediarouter.app.MediaRouteControllerDialogFragment;
+import androidx.mediarouter.app.MediaRouteDialogFactory;
+import androidx.mediarouter.app.MediaRouteDiscoveryFragment;
+import androidx.mediarouter.media.MediaControlIntent;
+import androidx.mediarouter.media.MediaItemStatus;
+import androidx.mediarouter.media.MediaRouteSelector;
+import androidx.mediarouter.media.MediaRouter;
+import androidx.mediarouter.media.MediaRouter.Callback;
+import androidx.mediarouter.media.MediaRouter.ProviderInfo;
+import androidx.mediarouter.media.MediaRouter.RouteInfo;
+
import com.example.android.supportv7.R;
import java.io.File;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SessionManager.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SessionManager.java
index fb909b2..516a426 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SessionManager.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/media/SessionManager.java
@@ -18,12 +18,13 @@
import android.app.PendingIntent;
import android.net.Uri;
-import androidx.mediarouter.media.MediaItemStatus;
-import androidx.mediarouter.media.MediaSessionStatus;
import android.util.Log;
-import java.util.List;
+import androidx.mediarouter.media.MediaItemStatus;
+import androidx.mediarouter.media.MediaSessionStatus;
+
import java.util.ArrayList;
+import java.util.List;
/**
* SessionManager manages a media session as a queue. It supports common
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/util/DiffUtilActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/util/DiffUtilActivity.java
index ad370e4..ac50104 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/util/DiffUtilActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/util/DiffUtilActivity.java
@@ -17,18 +17,19 @@
import android.os.AsyncTask;
import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.core.util.Pair;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.DiffUtil;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.Toast;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.util.Pair;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.supportv7.Cheeses;
import com.example.android.supportv7.widget.adapter.SimpleStringAdapter;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/util/SortedListActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/util/SortedListActivity.java
index cd91d27..761c383 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/util/SortedListActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/util/SortedListActivity.java
@@ -16,11 +16,6 @@
package com.example.android.supportv7.util;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.SortedList;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.SortedListAdapterCallback;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -31,6 +26,12 @@
import android.widget.EditText;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SortedList;
+import androidx.recyclerview.widget.SortedListAdapterCallback;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/CardViewActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/CardViewActivity.java
index 062a933..e07fe88 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/CardViewActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/CardViewActivity.java
@@ -17,15 +17,16 @@
import android.os.Bundle;
import android.os.Handler;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.cardview.widget.CardView;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RadioGroup;
import android.widget.SeekBar;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
+import androidx.core.content.ContextCompat;
+
import com.example.android.supportv7.R;
public class CardViewActivity extends AppCompatActivity {
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout1.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout1.java
index 6b27a2d..ce24832 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout1.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout1.java
@@ -16,11 +16,11 @@
package com.example.android.supportv7.view;
-import com.example.android.supportv7.R;
-
import android.app.Activity;
import android.os.Bundle;
+import com.example.android.supportv7.R;
+
/**
* Demonstrates using GridLayout to build the same "Simple Form" as in the
* LinearLayout and RelativeLayout demos.
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout2.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout2.java
index 86258aa..67cda29 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout2.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout2.java
@@ -16,11 +16,11 @@
package com.example.android.supportv7.view;
-import com.example.android.supportv7.R;
-
import android.app.Activity;
import android.os.Bundle;
+import com.example.android.supportv7.R;
+
/**
* A form, showing use of the GridLayout API from XML.
*/
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout3.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout3.java
index 0827831..359efd0 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout3.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/view/GridLayout3.java
@@ -16,6 +16,10 @@
package com.example.android.supportv7.view;
+import static android.text.InputType.TYPE_CLASS_TEXT;
+import static android.text.InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS;
+import static android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD;
+
import static androidx.gridlayout.widget.GridLayout.ALIGN_BOUNDS;
import static androidx.gridlayout.widget.GridLayout.BASELINE;
import static androidx.gridlayout.widget.GridLayout.CENTER;
@@ -23,22 +27,20 @@
import static androidx.gridlayout.widget.GridLayout.LEFT;
import static androidx.gridlayout.widget.GridLayout.RIGHT;
import static androidx.gridlayout.widget.GridLayout.spec;
-import static android.text.InputType.TYPE_CLASS_TEXT;
-import static android.text.InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS;
-import static android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD;
import android.app.Activity;
import android.content.Context;
import android.content.res.Configuration;
import android.os.Bundle;
-import androidx.gridlayout.widget.GridLayout;
-import androidx.gridlayout.widget.GridLayout.LayoutParams;
-import androidx.gridlayout.widget.GridLayout.Spec;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
+import androidx.gridlayout.widget.GridLayout;
+import androidx.gridlayout.widget.GridLayout.LayoutParams;
+import androidx.gridlayout.widget.GridLayout.Spec;
+
/**
* A form, showing use of the GridLayout API. Here we demonstrate use of the row/column order
* preserved property which allows rows and or columns to pass over each other when needed.
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java
index 3ac39c0..248e7ab 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/AnimatedRecyclerView.java
@@ -21,9 +21,6 @@
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
-import androidx.collection.ArrayMap;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.Menu;
@@ -34,6 +31,10 @@
import android.widget.CompoundButton;
import android.widget.TextView;
+import androidx.collection.ArrayMap;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.supportv7.R;
import java.util.ArrayList;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java
index 767e3f7..839c798 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/AsyncListUtilActivity.java
@@ -20,14 +20,15 @@
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
-import androidx.recyclerview.widget.AsyncListUtil;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.Menu;
import android.view.MenuItem;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.recyclerview.widget.AsyncListUtil;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.supportv7.Cheeses;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java
index 9276a80..98ae6c4 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/BaseLayoutManagerActivity.java
@@ -18,9 +18,6 @@
import android.app.Activity;
import android.os.Bundle;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -30,6 +27,10 @@
import android.widget.Spinner;
import android.widget.TextView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.supportv7.Cheeses;
import com.example.android.supportv7.R;
import com.example.android.supportv7.widget.adapter.SimpleStringAdapter;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java
index 411f827..98dc318 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/DrawerLayoutActivity.java
@@ -20,12 +20,6 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.os.Bundle;
-import androidx.core.content.ContextCompat;
-import androidx.core.view.GravityCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewTreeObserver;
@@ -34,6 +28,14 @@
import android.widget.FrameLayout;
import android.widget.ListView;
import android.widget.TextView;
+
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+
import com.example.android.supportv7.R;
import com.example.android.supportv7.Shakespeare;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java
index 306e25d..9ac08f2 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/GridLayoutManagerActivity.java
@@ -15,17 +15,18 @@
*/
package com.example.android.supportv7.widget;
-import com.example.android.supportv7.Cheeses;
-import com.example.android.supportv7.R;
-import com.example.android.supportv7.widget.adapter.SimpleStringAdapter;
-import com.example.android.supportv7.widget.util.ConfigToggle;
+import android.view.View;
+import android.view.ViewGroup;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
-import android.view.ViewGroup;
+
+import com.example.android.supportv7.Cheeses;
+import com.example.android.supportv7.R;
+import com.example.android.supportv7.widget.adapter.SimpleStringAdapter;
+import com.example.android.supportv7.widget.util.ConfigToggle;
/**
* A sample Activity to demonstrate capabilities of {@link GridLayoutManager}.
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java
index c3dc930..b19834a 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/LinearLayoutManagerJankActivity.java
@@ -16,9 +16,10 @@
package com.example.android.supportv7.widget;
+import android.view.ViewGroup;
+
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import android.view.ViewGroup;
import com.example.android.supportv7.Cheeses;
import com.example.android.supportv7.R;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java
index ba3397c..203c09b 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/ListPopupWindowActivity.java
@@ -17,8 +17,6 @@
package com.example.android.supportv7.widget;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.ListPopupWindow;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -28,6 +26,10 @@
import android.widget.CheckBox;
import android.widget.PopupWindow;
import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.ListPopupWindow;
+
import com.example.android.supportv7.R;
import java.text.SimpleDateFormat;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/ListViewActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/ListViewActivity.java
index 9843d91..fd3b9a2 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/ListViewActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/ListViewActivity.java
@@ -17,7 +17,6 @@
package com.example.android.supportv7.widget;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -25,6 +24,8 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.example.android.supportv7.R;
/**
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java
index d053a48..4f92510 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/NestedRecyclerViewActivity.java
@@ -18,13 +18,14 @@
import android.graphics.Color;
import android.os.Parcelable;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-import android.widget.TextView;
import com.example.android.supportv7.Cheeses;
import com.example.android.supportv7.R;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/PagerRecyclerViewActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/PagerRecyclerViewActivity.java
index 32b4712..1f3ed27 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/PagerRecyclerViewActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/PagerRecyclerViewActivity.java
@@ -17,11 +17,12 @@
package com.example.android.supportv7.widget;
import android.os.Bundle;
+import android.view.ViewGroup;
+
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.PagerSnapHelper;
import androidx.recyclerview.widget.RecyclerView;
-import android.view.ViewGroup;
import com.example.android.supportv7.Cheeses;
import com.example.android.supportv7.widget.adapter.SimpleStringAdapter;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java
index bcfc346..c78fa32 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/PopupMenuActivity.java
@@ -17,11 +17,6 @@
package com.example.android.supportv7.widget;
import android.os.Bundle;
-import androidx.core.view.MenuCompat;
-import androidx.core.view.MenuItemCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.appcompat.widget.SwitchCompat;
import android.view.ContextMenu;
import android.view.Gravity;
import android.view.Menu;
@@ -32,6 +27,12 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.view.MenuCompat;
+import androidx.core.view.MenuItemCompat;
+
import com.example.android.supportv7.R;
import java.text.SimpleDateFormat;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/RecyclerViewActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/RecyclerViewActivity.java
index 31c6766..203b952 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/RecyclerViewActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/RecyclerViewActivity.java
@@ -20,14 +20,15 @@
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.DisplayMetrics;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.supportv7.Cheeses;
import com.example.android.supportv7.widget.adapter.SimpleStringAdapter;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/StableIdActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/StableIdActivity.java
index 5243a40..f499047 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/StableIdActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/StableIdActivity.java
@@ -17,15 +17,16 @@
package com.example.android.supportv7.widget;
-import androidx.core.util.Pair;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.core.util.Pair;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.supportv7.Cheeses;
import com.example.android.supportv7.R;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java
index 5965c7d..f6931f1 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/StaggeredGridLayoutManagerActivity.java
@@ -16,11 +16,11 @@
package com.example.android.supportv7.widget;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+
import com.example.android.supportv7.R;
import com.example.android.supportv7.widget.util.ConfigToggle;
-import androidx.recyclerview.widget.StaggeredGridLayoutManager;
-
public class StaggeredGridLayoutManagerActivity
extends BaseLayoutManagerActivity<StaggeredGridLayoutManager> {
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java
index d627a61..1b9be89 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/adapter/SimpleStringAdapter.java
@@ -18,11 +18,12 @@
import android.content.Context;
import android.graphics.Color;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.TypedValue;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/ContentUriKeyProvider.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/ContentUriKeyProvider.java
index f4c01b0..cc83ca1 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/ContentUriKeyProvider.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/ContentUriKeyProvider.java
@@ -17,13 +17,13 @@
package com.example.android.supportv7.widget.selection.fancy;
import android.net.Uri;
+
import androidx.annotation.Nullable;
+import androidx.recyclerview.selection.ItemKeyProvider;
import java.util.HashMap;
import java.util.Map;
-import androidx.recyclerview.selection.ItemKeyProvider;
-
class ContentUriKeyProvider extends ItemKeyProvider<Uri> {
private final Uri[] mUris;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancyDetailsLookup.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancyDetailsLookup.java
index 5c8736c..9dc8227 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancyDetailsLookup.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancyDetailsLookup.java
@@ -16,13 +16,13 @@
package com.example.android.supportv7.widget.selection.fancy;
import android.net.Uri;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import android.view.MotionEvent;
import android.view.View;
+import androidx.annotation.Nullable;
import androidx.recyclerview.selection.ItemDetailsLookup;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
/**
* Access to details of an item associated with a {@link MotionEvent} instance.
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancyHolder.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancyHolder.java
index 0b64f6e..6cdd1b5 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancyHolder.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancyHolder.java
@@ -17,15 +17,15 @@
import android.graphics.Rect;
import android.net.Uri;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.MotionEvent;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.example.android.supportv7.R;
-
+import androidx.annotation.Nullable;
import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.android.supportv7.R;
final class FancyHolder extends RecyclerView.ViewHolder {
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java
index 030cab6..db3bfa2 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoActivity.java
@@ -19,24 +19,24 @@
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
-import androidx.annotation.CallSuper;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.widget.Toast;
-import com.example.android.supportv7.R;
-
+import androidx.annotation.CallSuper;
+import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
import androidx.recyclerview.selection.ItemKeyProvider;
import androidx.recyclerview.selection.SelectionPredicates;
import androidx.recyclerview.selection.SelectionTracker;
import androidx.recyclerview.selection.SelectionTracker.SelectionObserver;
import androidx.recyclerview.selection.StorageStrategy;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.android.supportv7.R;
/**
* ContentPager demo activity.
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoAdapter.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoAdapter.java
index 3b5f90e..0fcf599 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoAdapter.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/fancy/FancySelectionDemoAdapter.java
@@ -20,17 +20,17 @@
import android.content.Context;
import android.net.Uri;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
-import com.example.android.supportv7.Cheeses;
-import com.example.android.supportv7.R;
-
import androidx.recyclerview.selection.ItemKeyProvider;
import androidx.recyclerview.selection.SelectionTracker;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.android.supportv7.Cheeses;
+import com.example.android.supportv7.R;
final class FancySelectionDemoAdapter extends RecyclerView.Adapter<FancyHolder> {
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/DemoDetailsLookup.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/DemoDetailsLookup.java
index d63469f..81bda7f 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/DemoDetailsLookup.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/DemoDetailsLookup.java
@@ -15,13 +15,13 @@
*/
package com.example.android.supportv7.widget.selection.simple;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import android.view.MotionEvent;
import android.view.View;
+import androidx.annotation.Nullable;
import androidx.recyclerview.selection.ItemDetailsLookup;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
/**
* Access to details of an item associated with a {@link MotionEvent} instance.
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/DemoHolder.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/DemoHolder.java
index c9da6d0..ce5d4cd 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/DemoHolder.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/DemoHolder.java
@@ -16,15 +16,15 @@
package com.example.android.supportv7.widget.selection.simple;
import android.graphics.Rect;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.MotionEvent;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.example.android.supportv7.R;
-
+import androidx.annotation.Nullable;
import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.android.supportv7.R;
final class DemoHolder extends RecyclerView.ViewHolder {
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java
index c3f130c..6096b41 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoActivity.java
@@ -18,18 +18,14 @@
import android.content.Context;
import android.os.Bundle;
-import androidx.annotation.CallSuper;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.widget.Toast;
-import com.example.android.supportv7.R;
-
+import androidx.annotation.CallSuper;
+import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
import androidx.recyclerview.selection.ItemKeyProvider;
import androidx.recyclerview.selection.SelectionPredicates;
@@ -37,6 +33,10 @@
import androidx.recyclerview.selection.SelectionTracker.SelectionObserver;
import androidx.recyclerview.selection.StableIdKeyProvider;
import androidx.recyclerview.selection.StorageStrategy;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.android.supportv7.R;
/**
* ContentPager demo activity.
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoAdapter.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoAdapter.java
index e60e779..6eca668 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoAdapter.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/selection/simple/SimpleSelectionDemoAdapter.java
@@ -19,18 +19,18 @@
import static androidx.core.util.Preconditions.checkArgument;
import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
-import com.example.android.supportv7.Cheeses;
-import com.example.android.supportv7.R;
-
import androidx.recyclerview.selection.ItemKeyProvider;
import androidx.recyclerview.selection.SelectionTracker;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.android.supportv7.Cheeses;
+import com.example.android.supportv7.R;
final class SimpleSelectionDemoAdapter extends RecyclerView.Adapter<DemoHolder> {
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java
index 9d89b98..85a43f5 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/DragAndDropActivity.java
@@ -16,13 +16,14 @@
package com.example.android.supportv7.widget.touch;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.supportv7.R;
import com.example.android.supportv7.widget.util.ConfigToggle;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java
index 39c57d3..ad0fd43 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/ItemTouchHelperActivity.java
@@ -19,18 +19,19 @@
import android.app.Activity;
import android.graphics.Canvas;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.supportv7.Cheeses;
import com.example.android.supportv7.R;
import com.example.android.supportv7.widget.util.ConfigToggle;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java
index 274d8db..7f3660a 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/touch/SwipeToDismissActivity.java
@@ -17,13 +17,14 @@
package com.example.android.supportv7.widget.touch;
import android.graphics.Canvas;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.supportv7.R;
import com.example.android.supportv7.widget.util.ConfigToggle;
diff --git a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/util/ConfigViewHolder.java b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/util/ConfigViewHolder.java
index d6f8076..4b15904 100644
--- a/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/util/ConfigViewHolder.java
+++ b/samples/Support7Demos/src/main/java/com/example/android/supportv7/widget/util/ConfigViewHolder.java
@@ -16,11 +16,12 @@
package com.example.android.supportv7.widget.util;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
+import androidx.recyclerview.widget.RecyclerView;
+
public class ConfigViewHolder extends RecyclerView.ViewHolder
implements CompoundButton.OnCheckedChangeListener {
diff --git a/samples/SupportAnimationDemos/src/main/java/com/example/android/support/animation/MainActivity.java b/samples/SupportAnimationDemos/src/main/java/com/example/android/support/animation/MainActivity.java
index 3812711..78db1a6 100644
--- a/samples/SupportAnimationDemos/src/main/java/com/example/android/support/animation/MainActivity.java
+++ b/samples/SupportAnimationDemos/src/main/java/com/example/android/support/animation/MainActivity.java
@@ -18,14 +18,15 @@
import android.app.Activity;
import android.os.Bundle;
-import androidx.dynamicanimation.animation.DynamicAnimation;
-import androidx.dynamicanimation.animation.SpringAnimation;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;
import android.widget.SeekBar;
import android.widget.TextView;
+import androidx.dynamicanimation.animation.DynamicAnimation;
+import androidx.dynamicanimation.animation.SpringAnimation;
+
/**
* Activity for chained spring animations.
*/
diff --git a/samples/SupportAnimationDemos/src/main/java/com/example/android/support/animation/SpringActivity.java b/samples/SupportAnimationDemos/src/main/java/com/example/android/support/animation/SpringActivity.java
index 3eec30a..beb8df5 100644
--- a/samples/SupportAnimationDemos/src/main/java/com/example/android/support/animation/SpringActivity.java
+++ b/samples/SupportAnimationDemos/src/main/java/com/example/android/support/animation/SpringActivity.java
@@ -18,14 +18,15 @@
import android.app.Activity;
import android.os.Bundle;
-import androidx.dynamicanimation.animation.DynamicAnimation;
-import androidx.dynamicanimation.animation.SpringAnimation;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;
import android.widget.SeekBar;
import android.widget.TextView;
+import androidx.dynamicanimation.animation.DynamicAnimation;
+import androidx.dynamicanimation.animation.SpringAnimation;
+
/**
* This is a single spring animation. It provides a UI to interact with the spring, and two seek
* bars to tune the spring constants.
diff --git a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ContentCategoryActivity.java b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ContentCategoryActivity.java
index 7ea4ffc..d395368 100644
--- a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ContentCategoryActivity.java
+++ b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ContentCategoryActivity.java
@@ -16,15 +16,16 @@
package com.example.android.support.appnavigation.app;
-import com.example.android.support.appnavigation.R;
-
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import androidx.core.app.NavUtils;
import android.view.MenuItem;
import android.view.View;
+import androidx.core.app.NavUtils;
+
+import com.example.android.support.appnavigation.R;
+
public class ContentCategoryActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ContentViewActivity.java b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ContentViewActivity.java
index 8ed4168..f47897e 100644
--- a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ContentViewActivity.java
+++ b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ContentViewActivity.java
@@ -16,18 +16,17 @@
package com.example.android.support.appnavigation.app;
-import com.example.android.support.appnavigation.R;
-
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import androidx.core.app.NavUtils;
-import androidx.core.app.ShareCompat;
-import androidx.core.app.TaskStackBuilder;
-import android.text.TextUtils;
import android.view.MenuItem;
import android.widget.TextView;
+import androidx.core.app.NavUtils;
+import androidx.core.app.TaskStackBuilder;
+
+import com.example.android.support.appnavigation.R;
+
public class ContentViewActivity extends Activity {
public static final String EXTRA_TEXT = "com.example.android.appnavigation.EXTRA_TEXT";
diff --git a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/InterstitialMessageActivity.java b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/InterstitialMessageActivity.java
index 16d2a8d..e7ae6f2 100644
--- a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/InterstitialMessageActivity.java
+++ b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/InterstitialMessageActivity.java
@@ -16,14 +16,15 @@
package com.example.android.support.appnavigation.app;
-import com.example.android.support.appnavigation.R;
-
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import androidx.core.app.TaskStackBuilder;
import android.view.View;
+import androidx.core.app.TaskStackBuilder;
+
+import com.example.android.support.appnavigation.R;
+
public class InterstitialMessageActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/NotificationsActivity.java b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/NotificationsActivity.java
index ba79943..7faa6a9 100644
--- a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/NotificationsActivity.java
+++ b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/NotificationsActivity.java
@@ -16,18 +16,19 @@
package com.example.android.support.appnavigation.app;
-import com.example.android.support.appnavigation.R;
-
import android.app.Activity;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Intent;
import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+
import androidx.core.app.NavUtils;
import androidx.core.app.NotificationCompat;
import androidx.core.app.TaskStackBuilder;
-import android.view.MenuItem;
-import android.view.View;
+
+import com.example.android.support.appnavigation.R;
public class NotificationsActivity extends Activity {
@Override
diff --git a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/OutsideTaskActivity.java b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/OutsideTaskActivity.java
index 2f75d6b..22ff1bf 100644
--- a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/OutsideTaskActivity.java
+++ b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/OutsideTaskActivity.java
@@ -15,13 +15,13 @@
*/
package com.example.android.support.appnavigation.app;
-import com.example.android.support.appnavigation.R;
-
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
+import com.example.android.support.appnavigation.R;
+
public class OutsideTaskActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/PeerActivity.java b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/PeerActivity.java
index 1385ca6..e7ff85f 100644
--- a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/PeerActivity.java
+++ b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/PeerActivity.java
@@ -16,16 +16,17 @@
package com.example.android.support.appnavigation.app;
-import com.example.android.support.appnavigation.R;
-
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import androidx.core.app.NavUtils;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
+import androidx.core.app.NavUtils;
+
+import com.example.android.support.appnavigation.R;
+
public class PeerActivity extends Activity {
private static final String EXTRA_PEER_COUNT =
"com.example.android.appnavigation.EXTRA_PEER_COUNT";
diff --git a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/SimpleUpActivity.java b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/SimpleUpActivity.java
index 4d47fe5..a4a3136 100644
--- a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/SimpleUpActivity.java
+++ b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/SimpleUpActivity.java
@@ -16,13 +16,14 @@
package com.example.android.support.appnavigation.app;
-import com.example.android.support.appnavigation.R;
-
import android.app.Activity;
import android.os.Bundle;
-import androidx.core.app.NavUtils;
import android.view.MenuItem;
+import androidx.core.app.NavUtils;
+
+import com.example.android.support.appnavigation.R;
+
public class SimpleUpActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ViewFromOtherTaskActivity.java b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ViewFromOtherTaskActivity.java
index 02ca0aa..676a9b3 100644
--- a/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ViewFromOtherTaskActivity.java
+++ b/samples/SupportAppNavigation/src/main/java/com/example/android/support/appnavigation/app/ViewFromOtherTaskActivity.java
@@ -16,15 +16,16 @@
package com.example.android.support.appnavigation.app;
-import com.example.android.support.appnavigation.R;
-
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import androidx.core.app.NavUtils;
import android.view.MenuItem;
import android.view.View;
+import androidx.core.app.NavUtils;
+
+import com.example.android.support.appnavigation.R;
+
public class ViewFromOtherTaskActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/samples/SupportCarDemos/src/main/java/com/example/androidx/car/ActionBarActivity.java b/samples/SupportCarDemos/src/main/java/com/example/androidx/car/ActionBarActivity.java
index db6b690..1ac1c79 100644
--- a/samples/SupportCarDemos/src/main/java/com/example/androidx/car/ActionBarActivity.java
+++ b/samples/SupportCarDemos/src/main/java/com/example/androidx/car/ActionBarActivity.java
@@ -18,12 +18,12 @@
import android.content.Context;
import android.os.Bundle;
-import androidx.annotation.DrawableRes;
-import androidx.fragment.app.FragmentActivity;
import android.view.View;
import android.widget.ImageButton;
+import androidx.annotation.DrawableRes;
import androidx.car.widget.ActionBar;
+import androidx.fragment.app.FragmentActivity;
/**
* Demo activity for ActionBar
diff --git a/samples/SupportCarDemos/src/main/java/com/example/androidx/car/PagedListViewActivity.java b/samples/SupportCarDemos/src/main/java/com/example/androidx/car/PagedListViewActivity.java
index ad93dd2..bd470c4 100644
--- a/samples/SupportCarDemos/src/main/java/com/example/androidx/car/PagedListViewActivity.java
+++ b/samples/SupportCarDemos/src/main/java/com/example/androidx/car/PagedListViewActivity.java
@@ -18,17 +18,17 @@
import android.app.Activity;
import android.os.Bundle;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.car.widget.PagedListView;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.ArrayList;
import java.util.List;
-import androidx.car.widget.PagedListView;
-
/**
* Demo activity for PagedListView.
*/
diff --git a/samples/SupportCarDemos/src/main/java/com/example/androidx/car/SeekbarListItemActivity.java b/samples/SupportCarDemos/src/main/java/com/example/androidx/car/SeekbarListItemActivity.java
index 6975d61..d1a752d 100644
--- a/samples/SupportCarDemos/src/main/java/com/example/androidx/car/SeekbarListItemActivity.java
+++ b/samples/SupportCarDemos/src/main/java/com/example/androidx/car/SeekbarListItemActivity.java
@@ -22,9 +22,6 @@
import android.widget.SeekBar;
import android.widget.Toast;
-import java.util.ArrayList;
-import java.util.List;
-
import androidx.car.widget.ListItem;
import androidx.car.widget.ListItemAdapter;
import androidx.car.widget.ListItemProvider;
@@ -32,6 +29,9 @@
import androidx.car.widget.SeekbarListItem;
import androidx.car.widget.TextListItem;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Demo activity for {@link ListItem}.
*/
diff --git a/samples/SupportCarDemos/src/main/java/com/example/androidx/car/TextListItemActivity.java b/samples/SupportCarDemos/src/main/java/com/example/androidx/car/TextListItemActivity.java
index ad44300..d7eeaf9 100644
--- a/samples/SupportCarDemos/src/main/java/com/example/androidx/car/TextListItemActivity.java
+++ b/samples/SupportCarDemos/src/main/java/com/example/androidx/car/TextListItemActivity.java
@@ -26,16 +26,16 @@
import android.widget.FrameLayout;
import android.widget.Toast;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import androidx.car.widget.ListItem;
import androidx.car.widget.ListItemAdapter;
import androidx.car.widget.ListItemProvider;
import androidx.car.widget.PagedListView;
import androidx.car.widget.TextListItem;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
* Demo activity for {@link ListItem}.
*/
diff --git a/samples/SupportContentDemos/src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java b/samples/SupportContentDemos/src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java
index 4a24da7..8a661fc 100644
--- a/samples/SupportContentDemos/src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java
+++ b/samples/SupportContentDemos/src/main/java/com/example/android/support/content/demos/ContentPagerDemoActivity.java
@@ -19,22 +19,23 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.contentpager.content.ContentPager;
-import androidx.contentpager.content.ContentPager.ContentCallback;
-import androidx.contentpager.content.LoaderQueryRunner;
-import androidx.contentpager.content.Query;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.contentpager.content.ContentPager;
+import androidx.contentpager.content.ContentPager.ContentCallback;
+import androidx.contentpager.content.LoaderQueryRunner;
+import androidx.contentpager.content.Query;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.Locale;
/**
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/AppBarLayoutUsageBase.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/AppBarLayoutUsageBase.java
index 89a83f3..9607991 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/AppBarLayoutUsageBase.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/AppBarLayoutUsageBase.java
@@ -16,25 +16,26 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.Cheeses;
-import com.example.android.support.design.R;
-import com.example.android.support.design.Shakespeare;
-
import android.os.Bundle;
import android.os.Handler;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.design.widget.TabLayout;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.Toolbar;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.example.android.support.design.Cheeses;
+import com.example.android.support.design.R;
+import com.example.android.support.design.Shakespeare;
+
import java.util.Random;
abstract class AppBarLayoutUsageBase extends AppCompatActivity {
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomNavigationViewUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomNavigationViewUsage.java
index 573172b..e4ae51f 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomNavigationViewUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomNavigationViewUsage.java
@@ -18,14 +18,15 @@
import android.content.res.ColorStateList;
import android.os.Bundle;
-import androidx.annotation.NonNull;
import android.support.design.widget.BottomNavigationView;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.example.android.support.design.R;
/**
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetDynamicContent.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetDynamicContent.java
index c5ac3b5..d96db57 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetDynamicContent.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetDynamicContent.java
@@ -17,17 +17,18 @@
package com.example.android.support.design.widget;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.support.design.widget.BottomSheetBehavior;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.support.design.Cheeses;
import com.example.android.support.design.R;
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetHideable.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetHideable.java
index 0397fc2..1888c1b 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetHideable.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetHideable.java
@@ -16,16 +16,17 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.support.design.widget.BottomSheetBehavior;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.example.android.support.design.R;
+
/**
* This demonstrates basic usage of hideable {@link BottomSheetBehavior}.
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetModalBase.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetModalBase.java
index b536a5e..7cef4a8 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetModalBase.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetModalBase.java
@@ -18,15 +18,16 @@
import android.content.Context;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.support.design.widget.BottomSheetDialogFragment;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.support.design.Cheeses;
import com.example.android.support.design.R;
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetPersistent.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetPersistent.java
index 82b6c7d..5e02e60 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetPersistent.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetPersistent.java
@@ -16,10 +16,10 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-
import android.support.design.widget.BottomSheetBehavior;
+import com.example.android.support.design.R;
+
/**
* This demonstrates basic usage of persistent {@link BottomSheetBehavior}.
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetScrollView.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetScrollView.java
index 10e04fc..941f255 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetScrollView.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetScrollView.java
@@ -16,14 +16,15 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-import com.example.android.support.design.Shakespeare;
-
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
+import com.example.android.support.design.R;
+import com.example.android.support.design.Shakespeare;
+
public class BottomSheetScrollView extends BottomSheetUsageBase {
@Override
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetUsageBase.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetUsageBase.java
index fa1f9f1..62c76be 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetUsageBase.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetUsageBase.java
@@ -16,17 +16,18 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-import com.example.android.support.design.Shakespeare;
-
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.support.design.widget.BottomSheetBehavior;
-import androidx.appcompat.app.AppCompatActivity;
import android.text.TextUtils;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.android.support.design.R;
+import com.example.android.support.design.Shakespeare;
+
/**
* This demonstrates basic usage of {@link BottomSheetBehavior}.
*/
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetWithFab.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetWithFab.java
index 3060943..b3a2855 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetWithFab.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetWithFab.java
@@ -18,12 +18,13 @@
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.support.design.widget.BottomSheetBehavior;
import android.view.View;
import android.widget.Button;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import com.example.android.support.design.R;
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetWithFragment.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetWithFragment.java
index b2db6bf..b095c37 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetWithFragment.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/BottomSheetWithFragment.java
@@ -16,21 +16,22 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-
import android.content.Context;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.support.design.widget.BottomSheetBehavior;
-import androidx.fragment.app.Fragment;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.android.support.design.R;
+
/**
* This demonstrates basic usage of {@link BottomSheetBehavior} with Fragment.
*/
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CoordinatorLayoutInset.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CoordinatorLayoutInset.java
index 7618a7b..db9221a 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CoordinatorLayoutInset.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CoordinatorLayoutInset.java
@@ -17,9 +17,10 @@
package com.example.android.support.design.widget;
import android.os.Bundle;
+import android.widget.TextView;
+
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
-import android.widget.TextView;
import com.example.android.support.design.R;
import com.example.android.support.design.Shakespeare;
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CustomSnackbar.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CustomSnackbar.java
index 05a3a7d..bcc6303 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CustomSnackbar.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CustomSnackbar.java
@@ -16,10 +16,11 @@
package com.example.android.support.design.widget;
import android.support.design.widget.BaseTransientBottomBar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
import android.view.View;
import android.widget.TextView;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
import com.example.android.support.design.R;
/**
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CustomSnackbarUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CustomSnackbarUsage.java
index 6ec5027..bd0168e 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CustomSnackbarUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/CustomSnackbarUsage.java
@@ -18,11 +18,12 @@
import android.os.Bundle;
import android.support.design.widget.BaseTransientBottomBar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
import com.example.android.support.design.R;
/**
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/FloatingActionButtonUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/FloatingActionButtonUsage.java
index 375f9af..93fc0f2 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/FloatingActionButtonUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/FloatingActionButtonUsage.java
@@ -16,12 +16,13 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-
import android.os.Bundle;
+
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
+import com.example.android.support.design.R;
+
/**
* This demonstrates idiomatic usage of the Floating Action Button
*/
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewUsage.java
index 026fd31..7ed367a 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewUsage.java
@@ -16,17 +16,18 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-
import android.os.Bundle;
import android.support.design.widget.NavigationView;
-import androidx.core.view.GravityCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.appcompat.widget.Toolbar;
import android.util.TypedValue;
import android.view.MenuItem;
import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+
+import com.example.android.support.design.R;
+
/**
* This demonstrates basic usage of NavigationView
*/
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewUsageBase.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewUsageBase.java
index ffcb0d7..5d452a9 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewUsageBase.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewUsageBase.java
@@ -16,16 +16,17 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-
import android.os.Bundle;
-import androidx.annotation.LayoutRes;
import android.support.design.widget.NavigationView;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.MenuItem;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.LayoutRes;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.android.support.design.R;
+
public abstract class NavigationViewUsageBase extends AppCompatActivity {
private TextView mTextMessage;
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewWithoutDrawer.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewWithoutDrawer.java
index 28e4733..81e9419 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewWithoutDrawer.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/NavigationViewWithoutDrawer.java
@@ -16,11 +16,11 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-
import android.support.design.widget.NavigationView;
import android.view.MenuItem;
+import com.example.android.support.design.R;
+
/**
* This demonstrates basic usage of NavigationView
*/
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/SimpleStringRecyclerViewAdapter.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/SimpleStringRecyclerViewAdapter.java
index 7f562b5..12095bd 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/SimpleStringRecyclerViewAdapter.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/SimpleStringRecyclerViewAdapter.java
@@ -17,12 +17,13 @@
package com.example.android.support.design.widget;
import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.example.android.support.design.R;
import java.util.ArrayList;
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/SnackbarUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/SnackbarUsage.java
index adf0c1b..c0475ab 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/SnackbarUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/SnackbarUsage.java
@@ -18,11 +18,12 @@
import android.os.Bundle;
import android.support.design.widget.Snackbar;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.example.android.support.design.R;
/**
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutCustomItemsUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutCustomItemsUsage.java
index 8b4ff2b..299ea75 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutCustomItemsUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutCustomItemsUsage.java
@@ -18,8 +18,10 @@
import android.os.Bundle;
import android.support.design.widget.TabLayout;
+
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
+
import com.example.android.support.design.R;
/**
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutLayoutItemsUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutLayoutItemsUsage.java
index 2b54f16..cc56d52 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutLayoutItemsUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutLayoutItemsUsage.java
@@ -17,6 +17,7 @@
package com.example.android.support.design.widget;
import android.os.Bundle;
+
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutPreselectedUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutPreselectedUsage.java
index 468e479..f0b04cd 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutPreselectedUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutPreselectedUsage.java
@@ -18,11 +18,6 @@
import android.os.Bundle;
import android.support.design.widget.TabLayout;
-import androidx.viewpager.widget.PagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-import androidx.core.widget.TextViewCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@@ -30,6 +25,12 @@
import android.widget.RadioGroup;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.widget.TextViewCompat;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
import com.example.android.support.design.Cheeses;
import com.example.android.support.design.R;
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutUsage.java
index 3a0830b..3eb2c4f 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TabLayoutUsage.java
@@ -16,16 +16,8 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.Cheeses;
-import com.example.android.support.design.R;
-
import android.os.Bundle;
import android.support.design.widget.TabLayout;
-import androidx.viewpager.widget.PagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-import androidx.core.widget.TextViewCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@@ -33,6 +25,15 @@
import android.widget.RadioGroup;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.widget.TextViewCompat;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.example.android.support.design.Cheeses;
+import com.example.android.support.design.R;
+
import java.util.ArrayList;
import java.util.Random;
diff --git a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TextInputLayoutUsage.java b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TextInputLayoutUsage.java
index e386e73..92a7a66 100644
--- a/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TextInputLayoutUsage.java
+++ b/samples/SupportDesignDemos/src/main/java/com/example/android/support/design/widget/TextInputLayoutUsage.java
@@ -16,13 +16,14 @@
package com.example.android.support.design.widget;
-import com.example.android.support.design.R;
-
import android.os.Bundle;
import android.support.design.widget.TextInputLayout;
-import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.android.support.design.R;
+
/**
* This demonstrates idiomatic usage of {@code TextInputLayout}
*/
diff --git a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/Config.java b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/Config.java
index ee3102d..ef970f3 100644
--- a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/Config.java
+++ b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/Config.java
@@ -18,13 +18,14 @@
import android.content.Context;
import android.content.SharedPreferences;
+import android.util.Log;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.core.provider.FontRequest;
+import androidx.emoji.bundled.BundledEmojiCompatConfig;
import androidx.emoji.text.EmojiCompat;
import androidx.emoji.text.FontRequestEmojiCompatConfig;
-import androidx.emoji.bundled.BundledEmojiCompatConfig;
-import androidx.core.provider.FontRequest;
-import android.util.Log;
import java.util.HashSet;
import java.util.Set;
diff --git a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/ConfigLayout.java b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/ConfigLayout.java
index 5877432..06bcb75 100644
--- a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/ConfigLayout.java
+++ b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/ConfigLayout.java
@@ -18,13 +18,14 @@
import android.content.Context;
import android.os.Build;
-import androidx.annotation.RequiresApi;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.Switch;
+import androidx.annotation.RequiresApi;
+
/**
* Layout that includes configuration parameters.
*/
diff --git a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/CustomTextView.java b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/CustomTextView.java
index 0d0a639..eee5621 100755
--- a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/CustomTextView.java
+++ b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/CustomTextView.java
@@ -17,12 +17,13 @@
package com.example.android.support.text.emoji;
import android.content.Context;
-import androidx.annotation.Nullable;
-import androidx.emoji.widget.EmojiTextViewHelper;
-import androidx.appcompat.widget.AppCompatTextView;
import android.text.InputFilter;
import android.util.AttributeSet;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.emoji.widget.EmojiTextViewHelper;
+
/**
* A sample implementation of custom TextView.
diff --git a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/ListFragment.java b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/ListFragment.java
index 8926959..aaab09b 100644
--- a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/ListFragment.java
+++ b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/ListFragment.java
@@ -18,8 +18,6 @@
import android.content.Context;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -27,6 +25,9 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
import java.util.List;
/**
diff --git a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/MainActivity.java b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/MainActivity.java
index 08dba68..e6b13bd 100755
--- a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/MainActivity.java
+++ b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/MainActivity.java
@@ -17,6 +17,7 @@
package com.example.android.support.text.emoji;
import android.os.Bundle;
+
import androidx.appcompat.app.AppCompatActivity;
/**
diff --git a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/MainFragment.java b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/MainFragment.java
index 6a3f701..c1cb424 100644
--- a/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/MainFragment.java
+++ b/samples/SupportEmojiDemos/src/main/java/com/example/android/support/text/emoji/MainFragment.java
@@ -17,13 +17,14 @@
package com.example.android.support.text.emoji;
import android.os.Bundle;
-import androidx.emoji.text.EmojiCompat;
-import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.emoji.text.EmojiCompat;
+import androidx.fragment.app.Fragment;
+
/**
* Main fragment.
*/
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BackgroundHelper.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BackgroundHelper.java
index 7e3e2ef..5b7cd39 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BackgroundHelper.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BackgroundHelper.java
@@ -22,11 +22,12 @@
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Handler;
-import androidx.leanback.app.BackgroundManager;
-import androidx.core.content.ContextCompat;
import android.util.Log;
import android.view.View;
+import androidx.core.content.ContextCompat;
+import androidx.leanback.app.BackgroundManager;
+
/**
* App uses BackgroundHelper for each Activity, it wraps BackgroundManager and provides:
* 1. AsyncTask to load bitmap in background thread.
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseAnimationFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseAnimationFragment.java
index 6455e6f..55db481 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseAnimationFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseAnimationFragment.java
@@ -16,6 +16,10 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.HeaderItem;
import androidx.leanback.widget.ListRow;
@@ -24,9 +28,6 @@
import androidx.leanback.widget.Presenter;
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.View;
import java.util.Random;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseErrorSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseErrorSupportActivity.java
index d3238e0..2c7f4bc 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseErrorSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseErrorSupportActivity.java
@@ -16,8 +16,6 @@
*/
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.Fragment;
import android.os.Bundle;
import android.os.Handler;
import android.view.Gravity;
@@ -27,6 +25,9 @@
import android.widget.FrameLayout;
import android.widget.ProgressBar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
public class BrowseErrorSupportActivity extends FragmentActivity
{
/** Called when the activity is first created. */
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseFragment.java
index 20746a9..414979d 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseFragment.java
@@ -17,6 +17,13 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.app.GuidedStepFragment;
import androidx.leanback.app.RowsFragment;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -32,12 +39,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SectionRow;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
public class BrowseFragment extends androidx.leanback.app.BrowseFragment {
private static final String TAG = "leanback.BrowseFragment";
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseSupportActivity.java
index 19a5841..1fc483e 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseSupportActivity.java
@@ -16,9 +16,10 @@
*/
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
public class BrowseSupportActivity extends FragmentActivity {
/** Called when the activity is first created. */
@Override
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseSupportFragment.java
index 9681fe1..899f79d 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/BrowseSupportFragment.java
@@ -16,10 +16,17 @@
*/
package com.example.android.leanback;
-import androidx.fragment.app.Fragment;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.fragment.app.Fragment;
import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.app.RowsSupportFragment;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -35,12 +42,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SectionRow;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
public class BrowseSupportFragment extends androidx.leanback.app.BrowseSupportFragment {
private static final String TAG = "leanback.BrowseSupportFragment";
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/CardPresenter.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/CardPresenter.java
index 3bacc5b..5e3f080 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/CardPresenter.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/CardPresenter.java
@@ -16,9 +16,6 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.leanback.widget.ImageCardView;
-import androidx.leanback.widget.Presenter;
-import androidx.core.content.res.ResourcesCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.ContextThemeWrapper;
@@ -26,6 +23,10 @@
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.leanback.widget.ImageCardView;
+import androidx.leanback.widget.Presenter;
+
import java.util.List;
import java.util.Random;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/CustomTitleView.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/CustomTitleView.java
index 3e770e6..fb8cdd9 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/CustomTitleView.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/CustomTitleView.java
@@ -15,10 +15,11 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
-import androidx.leanback.widget.SearchOrbView;
import android.util.AttributeSet;
import android.view.View;
import android.widget.LinearLayout;
+
+import androidx.leanback.widget.SearchOrbView;
import androidx.leanback.widget.TitleViewAdapter;
public class CustomTitleView extends LinearLayout implements TitleViewAdapter.Provider {
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsFragment.java
index a28e770..b2eeb43 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsFragment.java
@@ -17,6 +17,12 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.widget.Action;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.ClassPresenterSelector;
@@ -33,11 +39,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.View;
-import android.widget.Toast;
public class DetailsFragment extends androidx.leanback.app.DetailsFragment {
private static final String TAG = "leanback.DetailsFragment";
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsPresenterSelectionActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsPresenterSelectionActivity.java
index 760657d..1a7c4fc 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsPresenterSelectionActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsPresenterSelectionActivity.java
@@ -20,6 +20,7 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+
import androidx.leanback.app.GuidedStepFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidanceStylist.Guidance;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsSupportActivity.java
index 2948ab9..f1a5ceb 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsSupportActivity.java
@@ -16,9 +16,10 @@
*/
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
public class DetailsSupportActivity extends FragmentActivity
{
public static final String EXTRA_ITEM = "item";
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsSupportFragment.java
index 1e0792e..258e21e 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/DetailsSupportFragment.java
@@ -20,6 +20,12 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.widget.Action;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.ClassPresenterSelector;
@@ -36,11 +42,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.View;
-import android.widget.Toast;
public class DetailsSupportFragment extends androidx.leanback.app.DetailsSupportFragment {
private static final String TAG = "leanback.DetailsSupportFragment";
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/ErrorFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/ErrorFragment.java
index 41f38e7..32dea2b 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/ErrorFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/ErrorFragment.java
@@ -15,10 +15,11 @@
import android.content.Context;
import android.os.Bundle;
-import androidx.core.content.res.ResourcesCompat;
import android.util.Log;
import android.view.View;
+import androidx.core.content.res.ResourcesCompat;
+
public class ErrorFragment extends androidx.leanback.app.ErrorFragment {
private static final String TAG = "leanback.ErrorFragment";
private static final boolean TRANSLUCENT = true;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/ErrorSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/ErrorSupportFragment.java
index 943cf52..cfe3bcf 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/ErrorSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/ErrorSupportFragment.java
@@ -18,10 +18,11 @@
import android.content.Context;
import android.os.Bundle;
-import androidx.core.content.res.ResourcesCompat;
import android.util.Log;
import android.view.View;
+import androidx.core.content.res.ResourcesCompat;
+
public class ErrorSupportFragment extends androidx.leanback.app.ErrorSupportFragment {
private static final String TAG = "leanback.ErrorSupportFragment";
private static final boolean TRANSLUCENT = true;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepActivity.java
index 4a28261..9a4b3e1 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepActivity.java
@@ -23,13 +23,6 @@
import android.content.res.Configuration;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.leanback.app.GuidedStepFragment;
-import androidx.leanback.widget.GuidanceStylist;
-import androidx.leanback.widget.GuidanceStylist.Guidance;
-import androidx.leanback.widget.GuidedAction;
-import androidx.leanback.widget.GuidedActionsStylist;
-import androidx.leanback.widget.GuidedDatePickerAction;
-import androidx.core.content.res.ResourcesCompat;
import android.text.InputType;
import android.text.TextUtils;
import android.util.Log;
@@ -38,6 +31,14 @@
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidanceStylist.Guidance;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.leanback.widget.GuidedDatePickerAction;
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepHalfScreenActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepHalfScreenActivity.java
index 46862c7..1a7c5b9 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepHalfScreenActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepHalfScreenActivity.java
@@ -21,11 +21,12 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.util.Log;
+
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.app.GuidedStepFragment;
import androidx.leanback.widget.GuidanceStylist.Guidance;
import androidx.leanback.widget.GuidedAction;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
import java.util.List;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepSupportActivity.java
index c13dcad..7265991 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepSupportActivity.java
@@ -19,20 +19,10 @@
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
import android.content.Context;
import android.content.res.Configuration;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.leanback.app.GuidedStepSupportFragment;
-import androidx.leanback.widget.GuidanceStylist;
-import androidx.leanback.widget.GuidanceStylist.Guidance;
-import androidx.leanback.widget.GuidedAction;
-import androidx.leanback.widget.GuidedActionsStylist;
-import androidx.leanback.widget.GuidedDatePickerAction;
-import androidx.core.content.res.ResourcesCompat;
import android.text.InputType;
import android.text.TextUtils;
import android.util.Log;
@@ -41,6 +31,17 @@
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.leanback.app.GuidedStepSupportFragment;
+import androidx.leanback.widget.GuidanceStylist;
+import androidx.leanback.widget.GuidanceStylist.Guidance;
+import androidx.leanback.widget.GuidedAction;
+import androidx.leanback.widget.GuidedActionsStylist;
+import androidx.leanback.widget.GuidedDatePickerAction;
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepSupportHalfScreenActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepSupportHalfScreenActivity.java
index c5c60ab..3ea417e 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepSupportHalfScreenActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/GuidedStepSupportHalfScreenActivity.java
@@ -19,16 +19,17 @@
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.util.Log;
+
+import androidx.core.content.res.ResourcesCompat;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist.Guidance;
import androidx.leanback.widget.GuidedAction;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
import java.util.List;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/HorizontalGridTestActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/HorizontalGridTestActivity.java
index e2ba69d..933ac92 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/HorizontalGridTestActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/HorizontalGridTestActivity.java
@@ -20,9 +20,6 @@
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
-import androidx.leanback.widget.HorizontalGridView;
-import androidx.leanback.widget.OnChildViewHolderSelectedListener;
-import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
@@ -30,6 +27,10 @@
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.leanback.widget.HorizontalGridView;
+import androidx.leanback.widget.OnChildViewHolderSelectedListener;
+import androidx.recyclerview.widget.RecyclerView;
+
public class HorizontalGridTestActivity extends Activity {
private static final String TAG = "HorizontalGridTestActivity";
private static final boolean DEBUG = true;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MainActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MainActivity.java
index 17fe1b7..8f245d7 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MainActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MainActivity.java
@@ -21,11 +21,12 @@
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.app.GuidedStepFragment;
import androidx.leanback.widget.GuidanceStylist.Guidance;
import androidx.leanback.widget.GuidedAction;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.res.ResourcesCompat;
import java.util.List;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MediaSessionService.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MediaSessionService.java
index b6866f6..477408b 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MediaSessionService.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MediaSessionService.java
@@ -28,12 +28,13 @@
import android.os.IBinder;
import android.os.Message;
import android.os.SystemClock;
-import androidx.annotation.Nullable;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.util.Log;
+import androidx.annotation.Nullable;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MusicPlayerFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MusicPlayerFragment.java
index 6c78441..6106355 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MusicPlayerFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/MusicPlayerFragment.java
@@ -22,6 +22,8 @@
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
+import android.support.v4.media.session.MediaSessionCompat;
+
import androidx.leanback.app.PlaybackFragment;
import androidx.leanback.app.PlaybackFragmentGlueHost;
import androidx.leanback.media.MediaControllerAdapter;
@@ -31,7 +33,6 @@
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.PlaybackControlsRow;
import androidx.media.session.MediaControllerCompat;
-import android.support.v4.media.session.MediaSessionCompat;
import com.google.gson.Gson;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/NewDetailsFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/NewDetailsFragment.java
index 3af816f..3ca26d2 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/NewDetailsFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/NewDetailsFragment.java
@@ -20,6 +20,13 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.app.DetailsFragmentBackgroundController;
import androidx.leanback.media.MediaPlayerAdapter;
import androidx.leanback.media.MediaPlayerGlue;
@@ -42,12 +49,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
public class NewDetailsFragment extends androidx.leanback.app.DetailsFragment {
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/NewDetailsSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/NewDetailsSupportFragment.java
index 95fc50a..f4863b8 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/NewDetailsSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/NewDetailsSupportFragment.java
@@ -23,6 +23,13 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.app.DetailsSupportFragmentBackgroundController;
import androidx.leanback.media.MediaPlayerAdapter;
import androidx.leanback.media.MediaPlayerGlue;
@@ -45,12 +52,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
public class NewDetailsSupportFragment extends androidx.leanback.app.DetailsSupportFragment {
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingDemoFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingDemoFragment.java
index 2a77e02..4898f94 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingDemoFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingDemoFragment.java
@@ -18,12 +18,13 @@
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.graphics.drawable.AnimationDrawable;
-import androidx.leanback.app.OnboardingFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import androidx.leanback.app.OnboardingFragment;
+
import java.util.ArrayList;
public class OnboardingDemoFragment extends OnboardingFragment {
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingDemoSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingDemoSupportFragment.java
index f6bafb7..4a24c01 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingDemoSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingDemoSupportFragment.java
@@ -21,12 +21,13 @@
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.graphics.drawable.AnimationDrawable;
-import androidx.leanback.app.OnboardingSupportFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import androidx.leanback.app.OnboardingSupportFragment;
+
import java.util.ArrayList;
public class OnboardingDemoSupportFragment extends OnboardingSupportFragment {
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingSupportActivity.java
index 9677b11..ddd865b 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/OnboardingSupportActivity.java
@@ -16,9 +16,10 @@
*/
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
public class OnboardingSupportActivity extends FragmentActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackControlGlue.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackControlGlue.java
index f23f6e9..2715ba4 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackControlGlue.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackControlGlue.java
@@ -19,13 +19,14 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Handler;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Toast;
+
import androidx.leanback.widget.Action;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.PlaybackControlsRow;
import androidx.leanback.widget.SparseArrayObjectAdapter;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.Toast;
abstract class PlaybackControlGlue extends androidx.leanback.media.PlaybackControlGlue {
/**
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackFragment.java
index 4af7424..b2e0284 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackFragment.java
@@ -19,6 +19,8 @@
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
+import android.util.Log;
+
import androidx.leanback.app.PlaybackFragmentGlueHost;
import androidx.leanback.widget.Action;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -27,7 +29,6 @@
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.ListRowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
-import android.util.Log;
/**
* Example of PlaybackFragment working with a PlaybackControlGlue.
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSeekAsyncDataProvider.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSeekAsyncDataProvider.java
index dbb30d0..b66789d 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSeekAsyncDataProvider.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSeekAsyncDataProvider.java
@@ -18,11 +18,12 @@
import android.graphics.Bitmap;
import android.os.AsyncTask;
-import androidx.leanback.widget.PlaybackSeekDataProvider;
-import androidx.collection.LruCache;
import android.util.Log;
import android.util.SparseArray;
+import androidx.collection.LruCache;
+import androidx.leanback.widget.PlaybackSeekDataProvider;
+
import java.util.Iterator;
import java.util.Map;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSupportActivity.java
index 76002b0..f29099c 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSupportActivity.java
@@ -19,9 +19,10 @@
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSupportFragment.java
index 4c38b4d..3574550 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackSupportFragment.java
@@ -22,6 +22,8 @@
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
+import android.util.Log;
+
import androidx.leanback.app.PlaybackSupportFragmentGlueHost;
import androidx.leanback.widget.Action;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -30,7 +32,6 @@
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.ListRowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
-import android.util.Log;
/**
* Example of PlaybackSupportFragment working with a PlaybackControlGlue.
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlFragment.java
index c0b885c..cd858d2 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlFragment.java
@@ -19,6 +19,8 @@
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
+import android.util.Log;
+
import androidx.leanback.app.PlaybackFragmentGlueHost;
import androidx.leanback.widget.Action;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -27,7 +29,6 @@
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.ListRowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
-import android.util.Log;
/**
* Example of PlaybackFragment working with a PlaybackControlGlue.
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlGlueSample.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlGlueSample.java
index 089ce26..b783171 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlGlueSample.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlGlueSample.java
@@ -20,11 +20,6 @@
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Handler;
-import androidx.leanback.media.PlaybackBaseControlGlue;
-import androidx.leanback.media.PlayerAdapter;
-import androidx.leanback.widget.Action;
-import androidx.leanback.widget.ArrayObjectAdapter;
-import androidx.leanback.widget.PlaybackControlsRow;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
@@ -33,6 +28,12 @@
import android.view.View;
import android.widget.Toast;
+import androidx.leanback.media.PlaybackBaseControlGlue;
+import androidx.leanback.media.PlayerAdapter;
+import androidx.leanback.widget.Action;
+import androidx.leanback.widget.ArrayObjectAdapter;
+import androidx.leanback.widget.PlaybackControlsRow;
+
class PlaybackTransportControlGlueSample<T extends PlayerAdapter> extends
androidx.leanback.media.PlaybackTransportControlGlue<T> {
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlSupportActivity.java
index 6483882..828b045 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlSupportActivity.java
@@ -19,9 +19,10 @@
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlSupportFragment.java
index acbb1e9..7e9f3d9 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/PlaybackTransportControlSupportFragment.java
@@ -22,6 +22,8 @@
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
+import android.util.Log;
+
import androidx.leanback.app.PlaybackSupportFragmentGlueHost;
import androidx.leanback.widget.Action;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -30,7 +32,6 @@
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.ListRowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
-import android.util.Log;
/**
* Example of PlaybackSupportFragment working with a PlaybackControlGlue.
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsActivity.java
index 34955c0..9a8d6e9 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsActivity.java
@@ -16,10 +16,11 @@
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
+import android.view.View;
+
import androidx.leanback.widget.BrowseFrameLayout;
import androidx.leanback.widget.TitleHelper;
import androidx.leanback.widget.TitleView;
-import android.view.View;
public class RowsActivity extends Activity
{
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsFragment.java
index 9f54083..7d11911 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsFragment.java
@@ -15,6 +15,9 @@
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
+
+import androidx.core.app.ActivityOptionsCompat;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.HeaderItem;
import androidx.leanback.widget.ImageCardView;
@@ -26,8 +29,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.TitleHelper;
-import androidx.core.app.ActivityOptionsCompat;
-import android.util.Log;
public class RowsFragment extends androidx.leanback.app.RowsFragment {
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsSupportActivity.java
index 61267a9..2985e76 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsSupportActivity.java
@@ -16,13 +16,14 @@
*/
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
import android.content.Intent;
import android.os.Bundle;
+import android.view.View;
+
+import androidx.fragment.app.FragmentActivity;
import androidx.leanback.widget.BrowseFrameLayout;
import androidx.leanback.widget.TitleHelper;
import androidx.leanback.widget.TitleView;
-import android.view.View;
public class RowsSupportActivity extends FragmentActivity
{
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsSupportFragment.java
index ac9bd38..0124ce2 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/RowsSupportFragment.java
@@ -18,6 +18,9 @@
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
+
+import androidx.core.app.ActivityOptionsCompat;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.HeaderItem;
import androidx.leanback.widget.ImageCardView;
@@ -29,8 +32,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.TitleHelper;
-import androidx.core.app.ActivityOptionsCompat;
-import android.util.Log;
public class RowsSupportFragment extends androidx.leanback.app.RowsSupportFragment {
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SampleVideoFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SampleVideoFragment.java
index de620ea..d85c3d4 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SampleVideoFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SampleVideoFragment.java
@@ -15,12 +15,13 @@
import android.net.Uri;
import android.os.Bundle;
+import android.support.v4.media.session.MediaSessionCompat;
+
import androidx.leanback.app.VideoFragmentGlueHost;
import androidx.leanback.media.MediaPlayerAdapter;
import androidx.leanback.media.PlaybackGlue;
import androidx.leanback.media.PlaybackTransportControlGlue;
import androidx.leanback.widget.PlaybackControlsRow;
-import android.support.v4.media.session.MediaSessionCompat;
/**
* Fragment demonstrating the use of {@link androidx.leanback.app.VideoFragment} to
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SampleVideoSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SampleVideoSupportFragment.java
index 586076c..0ea000e 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SampleVideoSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SampleVideoSupportFragment.java
@@ -18,12 +18,13 @@
import android.net.Uri;
import android.os.Bundle;
+import android.support.v4.media.session.MediaSessionCompat;
+
import androidx.leanback.app.VideoSupportFragmentGlueHost;
import androidx.leanback.media.MediaPlayerAdapter;
import androidx.leanback.media.PlaybackGlue;
import androidx.leanback.media.PlaybackTransportControlGlue;
import androidx.leanback.widget.PlaybackControlsRow;
-import android.support.v4.media.session.MediaSessionCompat;
/**
* Fragment demonstrating the use of {@link androidx.leanback.app.VideoSupportFragment} to
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchActivity.java
index 5b48733..2b12cc0 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchActivity.java
@@ -16,9 +16,10 @@
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
+
import androidx.leanback.app.SearchFragment;
import androidx.leanback.widget.SpeechRecognitionCallback;
-import android.util.Log;
public class SearchActivity extends Activity
{
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchFragment.java
index 3f33082..ed45bc4 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchFragment.java
@@ -8,7 +8,12 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
+
import androidx.annotation.Nullable;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.DiffCallback;
import androidx.leanback.widget.HeaderItem;
@@ -20,10 +25,6 @@
import androidx.leanback.widget.Presenter;
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.res.ResourcesCompat;
-import android.text.TextUtils;
-import android.util.Log;
import java.util.ArrayList;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchSupportActivity.java
index 159e274..e59850d 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchSupportActivity.java
@@ -16,12 +16,13 @@
*/
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
+
+import androidx.fragment.app.FragmentActivity;
import androidx.leanback.app.SearchSupportFragment;
import androidx.leanback.widget.SpeechRecognitionCallback;
-import android.util.Log;
public class SearchSupportActivity extends FragmentActivity
{
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchSupportFragment.java
index a511b48..6e57e61 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SearchSupportFragment.java
@@ -11,7 +11,12 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
+
import androidx.annotation.Nullable;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.DiffCallback;
import androidx.leanback.widget.HeaderItem;
@@ -23,10 +28,6 @@
import androidx.leanback.widget.Presenter;
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.res.ResourcesCompat;
-import android.text.TextUtils;
-import android.util.Log;
import java.util.ArrayList;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SettingsFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SettingsFragment.java
index 6ae7ef3..cb33c1c 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SettingsFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/SettingsFragment.java
@@ -17,12 +17,13 @@
package com.example.android.leanback;
import android.os.Bundle;
-import androidx.preference.PreferenceFragment;
+import android.widget.Toast;
+
import androidx.leanback.preference.LeanbackPreferenceFragment;
import androidx.leanback.preference.LeanbackSettingsFragment;
import androidx.preference.Preference;
+import androidx.preference.PreferenceFragment;
import androidx.preference.PreferenceScreen;
-import android.widget.Toast;
import java.util.Arrays;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/StringPresenter.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/StringPresenter.java
index e2dc29b..af22824 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/StringPresenter.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/StringPresenter.java
@@ -14,12 +14,13 @@
package com.example.android.leanback;
import android.content.Context;
-import androidx.leanback.widget.Presenter;
-import androidx.core.content.res.ResourcesCompat;
import android.util.Log;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.leanback.widget.Presenter;
+
public class StringPresenter extends Presenter {
private static final String TAG = "StringPresenter";
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridFragment.java
index 00b378c..8285d68 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridFragment.java
@@ -17,6 +17,10 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.OnItemViewClickedListener;
import androidx.leanback.widget.OnItemViewSelectedListener;
@@ -24,9 +28,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.VerticalGridPresenter;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.View;
public class VerticalGridFragment extends androidx.leanback.app.VerticalGridFragment {
private static final String TAG = "leanback.VerticalGridFragment";
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridSupportActivity.java
index 799afd7..6f5cca5 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridSupportActivity.java
@@ -16,9 +16,10 @@
*/
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
public class VerticalGridSupportActivity extends FragmentActivity
{
/** Called when the activity is first created. */
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridSupportFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridSupportFragment.java
index 7f0d4d7..8933f8f 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridSupportFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VerticalGridSupportFragment.java
@@ -20,6 +20,10 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.OnItemViewClickedListener;
import androidx.leanback.widget.OnItemViewSelectedListener;
@@ -27,9 +31,6 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.VerticalGridPresenter;
-import androidx.core.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.View;
public class VerticalGridSupportFragment extends androidx.leanback.app.VerticalGridSupportFragment {
private static final String TAG = "leanback.VerticalGridSupportFragment";
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VideoConsumptionWithDetailCardFragment.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VideoConsumptionWithDetailCardFragment.java
index e680d3a..105b27e 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VideoConsumptionWithDetailCardFragment.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VideoConsumptionWithDetailCardFragment.java
@@ -18,6 +18,7 @@
import android.net.Uri;
import android.os.Bundle;
+
import androidx.leanback.app.VideoFragment;
import androidx.leanback.app.VideoFragmentGlueHost;
import androidx.leanback.media.MediaPlayerAdapter;
diff --git a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VideoSupportActivity.java b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VideoSupportActivity.java
index c777a94..d4358c0 100644
--- a/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VideoSupportActivity.java
+++ b/samples/SupportLeanbackDemos/src/main/java/com/example/android/leanback/VideoSupportActivity.java
@@ -16,9 +16,10 @@
*/
package com.example.android.leanback;
-import androidx.fragment.app.FragmentActivity;
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
/**
* Activity demonstrating the use of {@link androidx.leanback.app.VideoFragment}
*/
diff --git a/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/CardPresenter.java b/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/CardPresenter.java
index 406d96a..b1bc4f3 100644
--- a/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/CardPresenter.java
+++ b/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/CardPresenter.java
@@ -17,10 +17,11 @@
package com.google.android.leanbackjank.presenter;
import android.net.Uri;
+import android.view.ViewGroup;
+
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.widget.ImageCardView;
import androidx.leanback.widget.Presenter;
-import androidx.core.content.res.ResourcesCompat;
-import android.view.ViewGroup;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.drawable.GlideDrawable;
diff --git a/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/GridItemPresenter.java b/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/GridItemPresenter.java
index 7f4408d..613aa4c 100644
--- a/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/GridItemPresenter.java
+++ b/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/GridItemPresenter.java
@@ -18,12 +18,13 @@
import android.content.res.Resources;
import android.graphics.Color;
-import androidx.leanback.widget.Presenter;
-import androidx.core.content.res.ResourcesCompat;
import android.view.Gravity;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.leanback.widget.Presenter;
+
import com.google.android.leanbackjank.R;
public class GridItemPresenter extends Presenter {
diff --git a/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/HeaderItemPresenter.java b/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/HeaderItemPresenter.java
index adfb31a..c7fc8b4 100644
--- a/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/HeaderItemPresenter.java
+++ b/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/presenter/HeaderItemPresenter.java
@@ -18,17 +18,18 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
-import androidx.leanback.widget.HeaderItem;
-import androidx.leanback.widget.ListRow;
-import androidx.leanback.widget.Presenter;
-import androidx.leanback.widget.RowHeaderPresenter;
-import androidx.core.content.res.ResourcesCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.leanback.widget.HeaderItem;
+import androidx.leanback.widget.ListRow;
+import androidx.leanback.widget.Presenter;
+import androidx.leanback.widget.RowHeaderPresenter;
+
import com.google.android.leanbackjank.R;
public class HeaderItemPresenter extends RowHeaderPresenter {
diff --git a/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/ui/MainFragment.java b/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/ui/MainFragment.java
index dc1e24f..2f22e96 100644
--- a/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/ui/MainFragment.java
+++ b/samples/SupportLeanbackJank/src/main/java/com/google/android/leanbackjank/ui/MainFragment.java
@@ -20,6 +20,8 @@
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
+
+import androidx.core.content.res.ResourcesCompat;
import androidx.leanback.app.BackgroundManager;
import androidx.leanback.app.BrowseFragment;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -29,7 +31,6 @@
import androidx.leanback.widget.Presenter;
import androidx.leanback.widget.PresenterSelector;
import androidx.leanback.widget.ShadowOverlayHelper;
-import androidx.core.content.res.ResourcesCompat;
import com.google.android.leanbackjank.IntentDefaults;
import com.google.android.leanbackjank.IntentKeys;
diff --git a/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferences.java b/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferences.java
index 3398e83..84b0f37 100644
--- a/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferences.java
+++ b/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferences.java
@@ -19,6 +19,7 @@
import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
+
import androidx.preference.PreferenceFragment;
import androidx.preference.PreferenceScreen;
diff --git a/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferencesCompat.java b/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferencesCompat.java
index c7a6216..d47c3a3 100644
--- a/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferencesCompat.java
+++ b/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferencesCompat.java
@@ -17,8 +17,9 @@
package com.example.android.supportpreference;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
+
import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
diff --git a/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferencesLeanback.java b/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferencesLeanback.java
index 0a6e38d..d221e70 100644
--- a/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferencesLeanback.java
+++ b/samples/SupportPreferenceDemos/src/main/java/com/example/android/supportpreference/FragmentSupportPreferencesLeanback.java
@@ -19,12 +19,13 @@
import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
+
import androidx.annotation.RequiresApi;
-import androidx.preference.PreferenceDialogFragment;
-import androidx.preference.PreferenceFragment;
import androidx.leanback.preference.LeanbackPreferenceFragment;
import androidx.leanback.preference.LeanbackSettingsFragment;
import androidx.preference.Preference;
+import androidx.preference.PreferenceDialogFragment;
+import androidx.preference.PreferenceFragment;
import androidx.preference.PreferenceScreen;
@RequiresApi(17)
diff --git a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
index 770ebc4..36a29ee 100644
--- a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
+++ b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SampleSliceProvider.java
@@ -36,9 +36,6 @@
import android.text.style.ForegroundColorSpan;
import android.util.SparseArray;
-import java.util.Arrays;
-import java.util.Calendar;
-
import androidx.annotation.NonNull;
import androidx.slice.Slice;
import androidx.slice.SliceProvider;
@@ -47,6 +44,9 @@
import androidx.slice.builders.MessagingSliceBuilder;
import androidx.slice.builders.SliceAction;
+import java.util.Arrays;
+import java.util.Calendar;
+
/**
* Examples of using slice template builders.
*/
diff --git a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java
index 163f6de..914b843 100644
--- a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java
+++ b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBroadcastReceiver.java
@@ -18,10 +18,10 @@
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
-import static com.example.androidx.slice.demos.SampleSliceProvider.getUri;
-
import static androidx.slice.core.SliceHints.EXTRA_RANGE_VALUE;
+import static com.example.androidx.slice.demos.SampleSliceProvider.getUri;
+
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
diff --git a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBrowser.java b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBrowser.java
index e3a2244..a5b77e3 100644
--- a/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBrowser.java
+++ b/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBrowser.java
@@ -31,10 +31,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.BaseColumns;
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
import android.util.ArrayMap;
import android.util.Log;
import android.view.Menu;
@@ -45,16 +41,20 @@
import android.widget.SearchView;
import android.widget.SimpleCursorAdapter;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
import androidx.slice.Slice;
import androidx.slice.SliceItem;
import androidx.slice.widget.EventInfo;
import androidx.slice.widget.SliceLiveData;
import androidx.slice.widget.SliceView;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
/**
* Example use of SliceView. Uses a search bar to select/auto-complete a slice uri which is
* then displayed in the selected mode with SliceView.
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java
index 198fa52..7f4a952 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ArcMotionUsage.java
@@ -17,14 +17,15 @@
package com.example.android.support.transition.widget;
import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import androidx.transition.ArcMotion;
import androidx.transition.ChangeBounds;
import androidx.transition.Transition;
import androidx.transition.TransitionManager;
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.FrameLayout;
import com.example.android.support.transition.R;
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/BeginDelayedUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/BeginDelayedUsage.java
index 54bb278..e041093 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/BeginDelayedUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/BeginDelayedUsage.java
@@ -17,11 +17,12 @@
package com.example.android.support.transition.widget;
import android.os.Bundle;
-import androidx.transition.TransitionManager;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.transition.TransitionManager;
+
import com.example.android.support.transition.R;
public class BeginDelayedUsage extends TransitionUsageBase {
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeClipBoundsUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeClipBoundsUsage.java
index 7b21e55..2ffab79 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeClipBoundsUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeClipBoundsUsage.java
@@ -19,13 +19,14 @@
import android.graphics.Rect;
import android.os.Bundle;
-import androidx.transition.ChangeClipBounds;
-import androidx.transition.TransitionManager;
-import androidx.core.view.ViewCompat;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import androidx.core.view.ViewCompat;
+import androidx.transition.ChangeClipBounds;
+import androidx.transition.TransitionManager;
+
import com.example.android.support.transition.R;
/**
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeColor.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeColor.java
index b0c3996..19f6041 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeColor.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeColor.java
@@ -21,12 +21,13 @@
import android.animation.ValueAnimator;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.ViewGroup;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.transition.Transition;
import androidx.transition.TransitionValues;
-import android.view.View;
-import android.view.ViewGroup;
/**
* A sample implementation of support {@link Transition}.
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java
index c95e462..a8198d5 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeImageTransformUsage.java
@@ -18,13 +18,14 @@
import android.graphics.Matrix;
import android.os.Bundle;
-import androidx.transition.ChangeImageTransform;
-import androidx.transition.Transition;
-import androidx.transition.TransitionManager;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import androidx.transition.ChangeImageTransform;
+import androidx.transition.Transition;
+import androidx.transition.TransitionManager;
+
import com.example.android.support.transition.R;
/**
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java
index 3203a33..6761f59 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ChangeTransformUsage.java
@@ -17,15 +17,16 @@
package com.example.android.support.transition.widget;
import android.os.Bundle;
-import androidx.transition.ArcMotion;
-import androidx.transition.ChangeTransform;
-import androidx.transition.TransitionManager;
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+import androidx.transition.ArcMotion;
+import androidx.transition.ChangeTransform;
+import androidx.transition.TransitionManager;
+
import com.example.android.support.transition.R;
/**
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/CustomUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/CustomUsage.java
index 37d5076..54cba44 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/CustomUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/CustomUsage.java
@@ -16,13 +16,14 @@
package com.example.android.support.transition.widget;
-import com.example.android.support.transition.R;
-
import android.os.Bundle;
+import android.view.ViewGroup;
+
import androidx.transition.Scene;
import androidx.transition.Transition;
import androidx.transition.TransitionManager;
-import android.view.ViewGroup;
+
+import com.example.android.support.transition.R;
/**
* This demonstrates usage of a custom Transition. See {@link ChangeColor} for the actual
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java
index 51e15a9..79dfc29 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ExplodeUsage.java
@@ -18,12 +18,13 @@
import android.graphics.Rect;
import android.os.Bundle;
+import android.view.View;
+import android.widget.FrameLayout;
+
import androidx.annotation.NonNull;
import androidx.transition.Explode;
import androidx.transition.Transition;
import androidx.transition.TransitionManager;
-import android.view.View;
-import android.widget.FrameLayout;
import com.example.android.support.transition.R;
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java
index 1c97ed1..fa7016a 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/FragmentTransitionUsage.java
@@ -17,18 +17,19 @@
package com.example.android.support.transition.widget;
import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.transition.AutoTransition;
-import androidx.transition.Fade;
-import androidx.transition.Transition;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.core.view.ViewCompat;
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+import androidx.transition.AutoTransition;
+import androidx.transition.Fade;
+import androidx.transition.Transition;
+
import com.example.android.support.transition.R;
/**
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java
index 6b7de95..6ac8e4e 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/ReparentImageUsage.java
@@ -17,13 +17,14 @@
package com.example.android.support.transition.widget;
import android.os.Bundle;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
import androidx.transition.ChangeImageTransform;
import androidx.transition.ChangeTransform;
import androidx.transition.TransitionManager;
import androidx.transition.TransitionSet;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
import com.example.android.support.transition.R;
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SceneUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SceneUsage.java
index 5ac7a0b..82920e3 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SceneUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SceneUsage.java
@@ -16,11 +16,12 @@
package com.example.android.support.transition.widget;
-import com.example.android.support.transition.R;
+import android.view.ViewGroup;
import androidx.transition.Scene;
import androidx.transition.TransitionManager;
-import android.view.ViewGroup;
+
+import com.example.android.support.transition.R;
/**
* This demonstrates basic usage of the Transition Scene.
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SceneUsageBase.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SceneUsageBase.java
index bc0f55c..fa9d9c7 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SceneUsageBase.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SceneUsageBase.java
@@ -17,12 +17,14 @@
package com.example.android.support.transition.widget;
import android.os.Bundle;
-import androidx.transition.Scene;
-import androidx.transition.TransitionManager;
import android.view.Menu;
import android.view.MenuItem;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+
+import androidx.transition.Scene;
+import androidx.transition.TransitionManager;
+
import com.example.android.support.transition.R;
abstract class SceneUsageBase extends TransitionUsageBase {
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SidePropagationUsage.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SidePropagationUsage.java
index 5e6af1c..6f38ffb 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SidePropagationUsage.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/SidePropagationUsage.java
@@ -17,13 +17,14 @@
package com.example.android.support.transition.widget;
import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.LinearLayout;
+
import androidx.transition.AutoTransition;
import androidx.transition.SidePropagation;
import androidx.transition.Transition;
import androidx.transition.TransitionManager;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.LinearLayout;
import com.example.android.support.transition.R;
diff --git a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/TransitionUsageBase.java b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/TransitionUsageBase.java
index 9f89379..1e94194 100644
--- a/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/TransitionUsageBase.java
+++ b/samples/SupportTransitionDemos/src/main/java/com/example/android/support/transition/widget/TransitionUsageBase.java
@@ -17,6 +17,7 @@
package com.example.android.support.transition.widget;
import android.os.Bundle;
+
import androidx.annotation.LayoutRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
diff --git a/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/AVDCListenerDemo.java b/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/AVDCListenerDemo.java
index ff9fffd..37a162b 100644
--- a/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/AVDCListenerDemo.java
+++ b/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/AVDCListenerDemo.java
@@ -19,14 +19,15 @@
import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatImageView;
import android.view.MotionEvent;
import android.view.View;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
+
import com.example.android.support.vectordrawable.R;
/**
diff --git a/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/SimpleAnimatedVectorDrawable.java b/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/SimpleAnimatedVectorDrawable.java
index 2d289fc..cc33a23 100644
--- a/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/SimpleAnimatedVectorDrawable.java
+++ b/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/SimpleAnimatedVectorDrawable.java
@@ -19,13 +19,14 @@
import android.app.Activity;
import android.content.res.Resources;
import android.os.Bundle;
-import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
+
import com.example.android.support.vectordrawable.R;
import java.text.DecimalFormat;
diff --git a/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/SimpleStaticVectorDrawable.java b/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/SimpleStaticVectorDrawable.java
index bbdf660..8ec9734 100644
--- a/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/SimpleStaticVectorDrawable.java
+++ b/samples/SupportVectorDrawableDemos/src/main/java/com/example/android/support/vectordrawable/app/SimpleStaticVectorDrawable.java
@@ -21,12 +21,13 @@
import android.graphics.PorterDuff.Mode;
import android.graphics.drawable.Drawable.ConstantState;
import android.os.Bundle;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+
import com.example.android.support.vectordrawable.R;
import java.text.DecimalFormat;
diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/AlertDialogDemo.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/AlertDialogDemo.java
index ed7700c..c52c2a2 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/AlertDialogDemo.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/AlertDialogDemo.java
@@ -19,11 +19,12 @@
import android.app.Activity;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
import android.view.View;
import android.widget.Button;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+
import com.example.android.support.wear.R;
/**
diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java
index d5915e3..21f13b8 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/AmbientModeDemo.java
@@ -18,9 +18,10 @@
import android.graphics.Color;
import android.os.Bundle;
+import android.widget.TextView;
+
import androidx.fragment.app.FragmentActivity;
import androidx.wear.ambient.AmbientMode;
-import android.widget.TextView;
import com.example.android.support.wear.R;
diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/CircularProgressLayoutDemo.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/CircularProgressLayoutDemo.java
index 454af1d..d6ab8f2 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/CircularProgressLayoutDemo.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/CircularProgressLayoutDemo.java
@@ -19,12 +19,13 @@
import android.app.Activity;
import android.os.Build;
import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.content.ContextCompat;
import androidx.wear.widget.CircularProgressLayout;
-import android.view.View;
-import android.widget.TextView;
import com.example.android.support.wear.R;
diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java
index 17d9902..2b92421 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/ConfirmationOverlayDemo.java
@@ -22,10 +22,10 @@
import android.view.ViewGroup;
import android.widget.Button;
-import com.example.android.support.wear.R;
-
import androidx.wear.widget.ConfirmationOverlay;
+import com.example.android.support.wear.R;
+
/** Main activity for the ConfirmationOverlay demo. */
public class ConfirmationOverlayDemo extends Activity {
diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/MainDemoActivity.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/MainDemoActivity.java
index aef698d..30626eb 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/MainDemoActivity.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/MainDemoActivity.java
@@ -24,15 +24,15 @@
import android.view.ViewGroup;
import android.widget.Button;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.wear.widget.WearableRecyclerView;
+
import com.example.android.support.wear.app.drawers.WearableDrawersDemo;
import java.util.LinkedHashMap;
import java.util.Map;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.wear.widget.WearableRecyclerView;
-
/**
* Main activity for the wear demos.
*/
diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/RoundedDrawableDemo.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/RoundedDrawableDemo.java
index 5bcbf1a..518168f 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/RoundedDrawableDemo.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/RoundedDrawableDemo.java
@@ -19,6 +19,7 @@
import android.app.Activity;
import android.os.Build;
import android.os.Bundle;
+
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/SimpleWearableRecyclerViewDemo.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/SimpleWearableRecyclerViewDemo.java
index 33fdc6f..c1d3d33 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/SimpleWearableRecyclerViewDemo.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/SimpleWearableRecyclerViewDemo.java
@@ -18,11 +18,12 @@
import android.app.Activity;
import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
import androidx.recyclerview.widget.RecyclerView;
import androidx.wear.widget.WearableLinearLayoutManager;
import androidx.wear.widget.WearableRecyclerView;
-import android.view.ViewGroup;
-import android.widget.TextView;
import com.example.android.support.wear.R;
diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java
index 469e261..34533d7 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/drawers/DemoNavDrawerAdapter.java
@@ -17,6 +17,7 @@
package com.example.android.support.wear.app.drawers;
import android.graphics.drawable.Drawable;
+
import androidx.wear.widget.drawer.WearableNavigationDrawerView.WearableNavigationDrawerAdapter;
/** Simple and declarative {@link WearableNavigationDrawerAdapter}. */
diff --git a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/drawers/WearableDrawersDemo.java b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/drawers/WearableDrawersDemo.java
index 520021d..23c9ec6 100644
--- a/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/drawers/WearableDrawersDemo.java
+++ b/samples/SupportWearDemos/src/main/java/com/example/android/support/wear/app/drawers/WearableDrawersDemo.java
@@ -19,12 +19,13 @@
import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
-import androidx.wear.widget.drawer.WearableActionDrawerView;
-import androidx.wear.widget.drawer.WearableNavigationDrawerView;
import android.util.Log;
import android.view.MenuItem;
import android.widget.Toast;
+import androidx.wear.widget.drawer.WearableActionDrawerView;
+import androidx.wear.widget.drawer.WearableNavigationDrawerView;
+
import com.example.android.support.wear.R;
/** Main {@link Activity} for demoing the Wearable Drawers. */
diff --git a/samples/ViewPager2Demos/src/main/java/com/example/androidx/viewpager2/CardActivity.java b/samples/ViewPager2Demos/src/main/java/com/example/androidx/viewpager2/CardActivity.java
index b117929..3b10ed4 100644
--- a/samples/ViewPager2Demos/src/main/java/com/example/androidx/viewpager2/CardActivity.java
+++ b/samples/ViewPager2Demos/src/main/java/com/example/androidx/viewpager2/CardActivity.java
@@ -20,17 +20,17 @@
import android.app.Activity;
import android.os.Bundle;
+import android.view.ViewGroup;
+
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
-import android.view.ViewGroup;
+import androidx.viewpager2.widget.ViewPager2;
import com.example.androidx.viewpager2.cards.Card;
import com.example.androidx.viewpager2.cards.CardView;
import java.util.List;
-import androidx.viewpager2.widget.ViewPager2;
-
/**
* Shows how to use {@link ViewPager2#setAdapter(RecyclerView.Adapter)}
*
diff --git a/samples/ViewPager2Demos/src/main/java/com/example/androidx/viewpager2/CardFragmentActivity.java b/samples/ViewPager2Demos/src/main/java/com/example/androidx/viewpager2/CardFragmentActivity.java
index dcbc80c..666f7d2 100644
--- a/samples/ViewPager2Demos/src/main/java/com/example/androidx/viewpager2/CardFragmentActivity.java
+++ b/samples/ViewPager2Demos/src/main/java/com/example/androidx/viewpager2/CardFragmentActivity.java
@@ -19,23 +19,23 @@
import static java.util.Collections.unmodifiableList;
import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import androidx.viewpager2.widget.ViewPager2;
+import androidx.viewpager2.widget.ViewPager2.FragmentProvider;
import com.example.androidx.viewpager2.cards.Card;
import com.example.androidx.viewpager2.cards.CardView;
import java.util.List;
-import androidx.viewpager2.widget.ViewPager2;
-import androidx.viewpager2.widget.ViewPager2.FragmentProvider;
-
/**
* Shows how to use {@link ViewPager2#setAdapter(FragmentManager, FragmentProvider, int)}
*
diff --git a/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java b/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java
index 3852a86..136cc31 100644
--- a/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java
+++ b/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java
@@ -20,6 +20,7 @@
import android.app.Activity;
import android.os.Looper;
import android.support.test.rule.ActivityTestRule;
+
import androidx.fragment.app.FragmentActivity;
import java.util.concurrent.CountDownLatch;
diff --git a/testutils/src/main/java/androidx/testutils/RecreatedActivity.java b/testutils/src/main/java/androidx/testutils/RecreatedActivity.java
index c580043..64f905c 100644
--- a/testutils/src/main/java/androidx/testutils/RecreatedActivity.java
+++ b/testutils/src/main/java/androidx/testutils/RecreatedActivity.java
@@ -17,8 +17,9 @@
package androidx.testutils;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.support.test.rule.ActivityTestRule;
+
+import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import java.util.concurrent.CountDownLatch;
diff --git a/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java b/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java
index e7aaa41..3381b13 100644
--- a/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java
+++ b/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java
@@ -17,8 +17,9 @@
package androidx.testutils;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.support.test.rule.ActivityTestRule;
+
+import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import java.util.concurrent.CountDownLatch;
diff --git a/textclassifier/src/androidTest/java/androidx/textclassifier/TextClassificationTest.java b/textclassifier/src/androidTest/java/androidx/textclassifier/TextClassificationTest.java
index 1d16e13..751aafc 100644
--- a/textclassifier/src/androidTest/java/androidx/textclassifier/TextClassificationTest.java
+++ b/textclassifier/src/androidTest/java/androidx/textclassifier/TextClassificationTest.java
@@ -26,6 +26,7 @@
import android.os.Parcel;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+
import androidx.core.os.LocaleListCompat;
import org.junit.Test;
diff --git a/textclassifier/src/androidTest/java/androidx/textclassifier/TextLinksTest.java b/textclassifier/src/androidTest/java/androidx/textclassifier/TextLinksTest.java
index 0ee41b3..c4dccb4 100644
--- a/textclassifier/src/androidTest/java/androidx/textclassifier/TextLinksTest.java
+++ b/textclassifier/src/androidTest/java/androidx/textclassifier/TextLinksTest.java
@@ -20,16 +20,17 @@
import static org.junit.Assert.assertTrue;
import android.os.Parcel;
-import androidx.annotation.Nullable;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
-import androidx.core.os.LocaleListCompat;
-import androidx.collection.ArrayMap;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.ClickableSpan;
import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
+import androidx.core.os.LocaleListCompat;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/textclassifier/src/androidTest/java/androidx/textclassifier/TextSelectionTest.java b/textclassifier/src/androidTest/java/androidx/textclassifier/TextSelectionTest.java
index 09f90b0..0174cc0 100644
--- a/textclassifier/src/androidTest/java/androidx/textclassifier/TextSelectionTest.java
+++ b/textclassifier/src/androidTest/java/androidx/textclassifier/TextSelectionTest.java
@@ -21,6 +21,7 @@
import android.os.Parcel;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
+
import androidx.core.os.LocaleListCompat;
import org.junit.Test;
diff --git a/textclassifier/src/main/java/androidx/textclassifier/EntityConfidence.java b/textclassifier/src/main/java/androidx/textclassifier/EntityConfidence.java
index c6bfc12..dfb6608 100644
--- a/textclassifier/src/main/java/androidx/textclassifier/EntityConfidence.java
+++ b/textclassifier/src/main/java/androidx/textclassifier/EntityConfidence.java
@@ -18,12 +18,13 @@
import android.os.Parcel;
import android.os.Parcelable;
+
import androidx.annotation.FloatRange;
import androidx.annotation.NonNull;
import androidx.annotation.RestrictTo;
import androidx.collection.ArrayMap;
-import androidx.core.util.Preconditions;
import androidx.collection.SimpleArrayMap;
+import androidx.core.util.Preconditions;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/textclassifier/src/main/java/androidx/textclassifier/TextClassification.java b/textclassifier/src/main/java/androidx/textclassifier/TextClassification.java
index 0b603b0..3056c9d 100644
--- a/textclassifier/src/main/java/androidx/textclassifier/TextClassification.java
+++ b/textclassifier/src/main/java/androidx/textclassifier/TextClassification.java
@@ -23,14 +23,16 @@
import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
+
import androidx.annotation.FloatRange;
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
-import androidx.core.os.LocaleListCompat;
import androidx.collection.ArrayMap;
+import androidx.core.os.LocaleListCompat;
import androidx.core.util.Preconditions;
+import androidx.textclassifier.TextClassifier.EntityType;
import java.util.ArrayList;
import java.util.Calendar;
@@ -38,8 +40,6 @@
import java.util.Locale;
import java.util.Map;
-import androidx.textclassifier.TextClassifier.EntityType;
-
/**
* Information for generating a widget to handle classified text.
*
diff --git a/textclassifier/src/main/java/androidx/textclassifier/TextClassifier.java b/textclassifier/src/main/java/androidx/textclassifier/TextClassifier.java
index b747cb1..5e2584d 100644
--- a/textclassifier/src/main/java/androidx/textclassifier/TextClassifier.java
+++ b/textclassifier/src/main/java/androidx/textclassifier/TextClassifier.java
@@ -18,6 +18,7 @@
import android.os.Parcel;
import android.os.Parcelable;
+
import androidx.annotation.IntDef;
import androidx.annotation.RestrictTo;
import androidx.annotation.StringDef;
diff --git a/textclassifier/src/main/java/androidx/textclassifier/TextLinks.java b/textclassifier/src/main/java/androidx/textclassifier/TextLinks.java
index 1e393d2..f727300 100644
--- a/textclassifier/src/main/java/androidx/textclassifier/TextLinks.java
+++ b/textclassifier/src/main/java/androidx/textclassifier/TextLinks.java
@@ -18,6 +18,10 @@
import android.os.Parcel;
import android.os.Parcelable;
+import android.text.Spannable;
+import android.text.style.ClickableSpan;
+import android.view.View;
+
import androidx.annotation.FloatRange;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
@@ -25,9 +29,7 @@
import androidx.annotation.RestrictTo;
import androidx.core.os.LocaleListCompat;
import androidx.core.util.Preconditions;
-import android.text.Spannable;
-import android.text.style.ClickableSpan;
-import android.view.View;
+import androidx.textclassifier.TextClassifier.EntityType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -37,8 +39,6 @@
import java.util.List;
import java.util.Map;
-import androidx.textclassifier.TextClassifier.EntityType;
-
/**
* A collection of links, representing subsequences of text and the entity types (phone number,
* address, url, etc) they may be.
diff --git a/textclassifier/src/main/java/androidx/textclassifier/TextSelection.java b/textclassifier/src/main/java/androidx/textclassifier/TextSelection.java
index ebb91b9..d1802b6 100644
--- a/textclassifier/src/main/java/androidx/textclassifier/TextSelection.java
+++ b/textclassifier/src/main/java/androidx/textclassifier/TextSelection.java
@@ -18,20 +18,20 @@
import android.os.Parcel;
import android.os.Parcelable;
+
import androidx.annotation.FloatRange;
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
-import androidx.core.os.LocaleListCompat;
import androidx.collection.ArrayMap;
+import androidx.core.os.LocaleListCompat;
import androidx.core.util.Preconditions;
+import androidx.textclassifier.TextClassifier.EntityType;
import java.util.Locale;
import java.util.Map;
-import androidx.textclassifier.TextClassifier.EntityType;
-
/**
* Information about where text selection should be.
*/
diff --git a/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java b/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
index 618278f..3c64b9c 100644
--- a/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
@@ -29,13 +29,14 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
-import androidx.core.os.BuildCompat;
import android.webkit.SafeBrowsingResponse;
import android.webkit.ValueCallback;
import android.webkit.WebResourceRequest;
import android.webkit.WebView;
import android.webkit.WebViewClient;
+import androidx.core.os.BuildCompat;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/webkit/src/main/java/androidx/webkit/WebViewCompat.java b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
index e6ea267..6a48e35 100644
--- a/webkit/src/main/java/androidx/webkit/WebViewCompat.java
+++ b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
@@ -20,11 +20,15 @@
import android.net.Uri;
import android.os.Build;
import android.os.Looper;
+import android.webkit.ValueCallback;
+import android.webkit.WebView;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.BuildCompat;
-import android.webkit.ValueCallback;
-import android.webkit.WebView;
+import androidx.webkit.internal.WebViewGlueCommunicator;
+import androidx.webkit.internal.WebViewProviderAdapter;
+import androidx.webkit.internal.WebViewProviderFactoryAdapter;
import org.chromium.support_lib_boundary.WebViewProviderBoundaryInterface;
@@ -32,10 +36,6 @@
import java.lang.reflect.Method;
import java.util.List;
-import androidx.webkit.internal.WebViewGlueCommunicator;
-import androidx.webkit.internal.WebViewProviderAdapter;
-import androidx.webkit.internal.WebViewProviderFactoryAdapter;
-
/**
* Compatibility version of {@link android.webkit.WebView}
*/
diff --git a/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java b/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java
index c6917d8..4e95e22 100644
--- a/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java
+++ b/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java
@@ -16,10 +16,10 @@
package androidx.webkit.internal;
-import org.chromium.support_lib_boundary.VisualStateCallbackBoundaryInterface;
-
import androidx.webkit.WebViewCompat;
+import org.chromium.support_lib_boundary.VisualStateCallbackBoundaryInterface;
+
/**
* Adapter between WebViewCompat.VisualStateCallback and VisualStateCallbackBoundaryInterface (the
* corresponding interface shared with the support library glue in the WebView APK).
diff --git a/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java b/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
index da10713..6546fcf 100644
--- a/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
+++ b/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
@@ -16,9 +16,10 @@
package androidx.webkit.internal;
-import androidx.core.os.BuildCompat;
import android.webkit.WebView;
+import androidx.core.os.BuildCompat;
+
import org.chromium.support_lib_boundary.WebViewProviderFactoryBoundaryInterface;
import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil;
diff --git a/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java b/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
index 2093e0b..c440892 100644
--- a/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
+++ b/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
@@ -16,11 +16,11 @@
package androidx.webkit.internal;
+import androidx.webkit.WebViewCompat;
+
import org.chromium.support_lib_boundary.WebViewProviderBoundaryInterface;
import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil;
-import androidx.webkit.WebViewCompat;
-
/**
* Adapter for WebViewProviderBoundaryInterface providing the functionality expected of
* WebViewCompat, this adapter is the support library version of