Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

src/com/android/settings/widget/ActionBarShadowController.java

@@ -18,8 +18,6 @@ package com.android.settings.widget;
 
 import android.app.ActionBar;
 import android.app.Activity;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -27,6 +25,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * A controller that adds shadow to actionbar when content view scrolls.
  * <p/>

src/com/android/settings/widget/ActionButtonPreference.java

@@ -17,9 +17,6 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import androidx.annotation.StringRes;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -27,6 +24,10 @@ import android.widget.Button;
 
 import com.android.settings.R;
 
+import androidx.annotation.StringRes;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 public class ActionButtonPreference extends Preference {
 
     private final ButtonInfo mButton1Info = new ButtonInfo();

src/com/android/settings/widget/AppCheckBoxPreference.java

@@ -17,11 +17,12 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import androidx.preference.CheckBoxPreference;
 import android.util.AttributeSet;
 
 import com.android.settings.R;
 
+import androidx.preference.CheckBoxPreference;
+
 /**
  * {@link CheckBoxPreference} that used only to display app
  */

src/com/android/settings/widget/AppPreference.java

@@ -16,8 +16,6 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -25,6 +23,9 @@ import android.widget.ProgressBar;
 
 import com.android.settings.R;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 public class AppPreference extends Preference {
 
     private int mProgress;

src/com/android/settings/widget/AppSwitchPreference.java

@@ -17,13 +17,14 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import androidx.preference.SwitchPreference;
-import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.view.View;
 
 import com.android.settings.R;
 
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.SwitchPreference;
+
 public class AppSwitchPreference extends SwitchPreference {
 
     public AppSwitchPreference(Context context) {

src/com/android/settings/widget/AspectRatioFrameLayout.java

@@ -16,12 +16,13 @@ package com.android.settings.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import androidx.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
 import com.android.settings.R;
 
+import androidx.annotation.VisibleForTesting;
+
 /**
  * A {@link FrameLayout} with customizable aspect ratio.
  * This is used to avoid dynamically calculating the height for the frame. Default aspect

src/com/android/settings/widget/BottomLabelLayout.java

@@ -18,7 +18,6 @@ package com.android.settings.widget;
 
 import android.annotation.Nullable;
 import android.content.Context;
-import androidx.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
@@ -26,6 +25,8 @@ import android.widget.LinearLayout;
 
 import com.android.settingslib.R;
 
+import androidx.annotation.VisibleForTesting;
+
 /**
  * An extension of LinearLayout that automatically switches to vertical
  * orientation when it can't fit its child views horizontally.

src/com/android/settings/widget/ChartDataUsageView.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.widget;
 
+import static android.net.TrafficStats.MB_IN_BYTES;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.NetworkPolicy;
@@ -42,8 +44,6 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Objects;
 
-import static android.net.TrafficStats.MB_IN_BYTES;
-
 /**
  * Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along
  * with {@link ChartSweepView} for inspection ranges and warning/limits.

src/com/android/settings/widget/ChartGridView.java

@@ -16,6 +16,8 @@
 
 package com.android.settings.widget;
 
+import static com.android.settings.Utils.formatDateRange;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
@@ -32,8 +34,6 @@ import android.view.View;
 import com.android.internal.util.Preconditions;
 import com.android.settings.R;
 
-import static com.android.settings.Utils.formatDateRange;
-
 /**
  * Background of {@link ChartView} that renders grid lines as requested by
  * {@link ChartAxis#getTickPoints()}.

src/com/android/settings/widget/ChartNetworkSeriesView.java

@@ -16,6 +16,9 @@
 
 package com.android.settings.widget;
 
+import static android.text.format.DateUtils.DAY_IN_MILLIS;
+import static android.text.format.DateUtils.WEEK_IN_MILLIS;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
@@ -33,9 +36,6 @@ import android.view.View;
 import com.android.internal.util.Preconditions;
 import com.android.settings.R;
 
-import static android.text.format.DateUtils.DAY_IN_MILLIS;
-import static android.text.format.DateUtils.WEEK_IN_MILLIS;
-
 /**
  * {@link NetworkStatsHistory} series to render inside a {@link ChartView},
  * using {@link ChartAxis} to map into screen coordinates.

src/com/android/settings/widget/DisabledCheckBoxPreference.java

@@ -18,11 +18,12 @@ package com.android.settings.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import androidx.preference.CheckBoxPreference;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * A CheckboxPreference that can disable its checkbox separate from its text.
  * Differs from CheckboxPreference.setDisabled() in that the text is not dimmed.

src/com/android/settings/widget/DonutView.java

@@ -36,14 +36,14 @@ import android.text.style.RelativeSizeSpan;
 import android.util.AttributeSet;
 import android.view.View;
 
-import androidx.annotation.ColorRes;
-
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.Utils;
 
 import java.util.Locale;
 
+import androidx.annotation.ColorRes;
+
 /**
  * DonutView represents a donut graph. It visualizes a certain percentage of fullness with a
  * corresponding label with the fullness on the inside (i.e. "50%" inside of the donut).

src/com/android/settings/widget/DotsPageIndicator.java

@@ -30,14 +30,16 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.RectF;
 import android.os.Build;
-import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.Interpolator;
+
 import com.android.settings.R;
 
 import java.util.Arrays;
 
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * Custom pager indicator for use with a {@code ViewPager}.
  */

src/com/android/settings/widget/EntityHeaderController.java

@@ -31,11 +31,6 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.UserHandle;
-
-import androidx.annotation.IntDef;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.RecyclerView;
-
 import android.text.TextUtils;
 import android.util.IconDrawableFactory;
 import android.util.Log;
@@ -57,6 +52,10 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class EntityHeaderController {
 
     @IntDef({ActionType.ACTION_NONE,

src/com/android/settings/widget/FixedLineSummaryPreference.java

@@ -16,13 +16,15 @@ package com.android.settings.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils.TruncateAt;
 import android.util.AttributeSet;
 import android.widget.TextView;
+
 import com.android.settings.R;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * A preference whose summary text will only span one single line.
  */

src/com/android/settings/widget/GearPreference.java

@@ -17,13 +17,14 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 
 import com.android.settings.R;
 import com.android.settingslib.RestrictedPreference;
 
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * A preference with a Gear on the side
  */

src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java

@@ -25,12 +25,6 @@ import android.animation.ValueAnimator;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceGroupAdapter;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
@@ -39,6 +33,13 @@ import android.view.View;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceGroupAdapter;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter {
 
     private static final String TAG = "HighlightableAdapter";

src/com/android/settings/widget/LabeledSeekBar.java

@@ -17,12 +17,8 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.customview.widget.ExploreByTouchHelper;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -33,6 +29,10 @@ import android.widget.SeekBar;
 
 import java.util.List;
 
+import androidx.core.view.ViewCompat;
+import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
+
 /**
  * LabeledSeekBar represent a seek bar assigned with labeled, discrete values.
  * It pretends to be a group of radio button for AccessibilityServices, in order to adjust the

src/com/android/settings/widget/MasterCheckBoxPreference.java

@@ -17,7 +17,6 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -26,6 +25,8 @@ import android.widget.CheckBox;
 import com.android.settings.R;
 import com.android.settingslib.TwoTargetPreference;
 
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * A custom preference that provides inline checkbox. It has a mandatory field for title, and
  * optional fields for icon and sub-text.

src/com/android/settings/widget/MasterSwitchController.java

@@ -16,10 +16,10 @@
 
 package com.android.settings.widget;
 
-import androidx.preference.Preference;
-import android.widget.Switch;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
+import androidx.preference.Preference;
+
 /*
  * The switch controller that is used to update the switch widget in the MasterSwitchPreference
  * layout.

src/com/android/settings/widget/MasterSwitchPreference.java

@@ -17,7 +17,6 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -27,6 +26,8 @@ import com.android.settings.R;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.TwoTargetPreference;
 
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * A custom preference that provides inline switch toggle. It has a mandatory field for title, and
  * optional fields for icon and sub-text.

src/com/android/settings/widget/RadioButtonPickerFragment.java

@@ -20,10 +20,6 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.view.LayoutInflater;
@@ -38,6 +34,11 @@ import com.android.settingslib.widget.CandidateInfo;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFragment implements
         RadioButtonPreference.OnClickListener {
 

src/com/android/settings/widget/RadioButtonPreference.java

@@ -17,9 +17,6 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.CheckBoxPreference;
-import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -27,6 +24,10 @@ import android.widget.TextView;
 
 import com.android.settings.R;
 
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * Check box preference with check box replaced by radio button.
  *

src/com/android/settings/widget/RestrictedAppPreference.java

@@ -18,8 +18,6 @@ package com.android.settings.widget;
 
 import android.content.Context;
 import android.os.UserHandle;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -28,6 +26,9 @@ import com.android.settings.R;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreferenceHelper;
 
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * {@link AppPreference} that implements user restriction utilities using
  * {@link com.android.settingslib.RestrictedPreferenceHelper}.

src/com/android/settings/widget/RtlCompatibleViewPager.java

@@ -17,15 +17,16 @@
 package com.android.settings.widget;
 
 import android.content.Context;
+import android.os.Parcel;
 import android.os.Parcelable;
-import androidx.viewpager.widget.ViewPager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
-import android.os.Parcel;
 
 import java.util.Locale;
 
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * A {@link ViewPager} that's aware of RTL changes when used with FragmentPagerAdapter.
  */

src/com/android/settings/widget/ScrollToParentEditText.java

@@ -21,9 +21,6 @@ import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewParent;
-import android.widget.EditText;
-
-import com.android.settings.widget.ImeAwareEditText;
 
 /**
  * An EditText that, instead of scrolling to itself when focused, will request scrolling to its

src/com/android/settings/widget/SeekBarPreference.java

@@ -20,8 +20,6 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Parcel;
 import android.os.Parcelable;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
@@ -30,9 +28,11 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 
-import com.android.settings.widget.DefaultIndicatorSeekBar;
 import com.android.settingslib.RestrictedPreference;
 
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * Based on android.preference.SeekBarPreference, but uses support preference as base.
  */

src/com/android/settings/widget/SettingsAppWidgetProvider.java

@@ -16,7 +16,6 @@
 
 package com.android.settings.widget;
 
-import android.app.ActivityManager;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ -33,14 +32,10 @@ import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.os.Handler;
-import android.os.IPowerManager;
 import android.os.PowerManager;
 import android.os.Process;
-import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.provider.Settings.Secure;
 import android.util.Log;
 import android.widget.RemoteViews;
 

src/com/android/settings/widget/SlidingTabLayout.java

@@ -17,7 +17,6 @@
 package com.android.settings.widget;
 
 import android.content.Context;
-import androidx.viewpager.widget.PagerAdapter;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -28,6 +27,8 @@ import android.widget.TextView;
 
 import com.android.settings.R;
 
+import androidx.viewpager.widget.PagerAdapter;
+
 /**
  * To be used with ViewPager to provide a tab indicator component which give constant feedback as
  * to the user's scroll progress.

src/com/android/settings/widget/SwitchBar.java

@@ -23,9 +23,6 @@ import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.os.Parcel;
 import android.os.Parcelable;
-import androidx.annotation.ColorInt;
-import androidx.annotation.StringRes;
-import androidx.annotation.VisibleForTesting;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.TextAppearanceSpan;
@@ -47,6 +44,10 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+
 public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener {
 
     public interface OnSwitchChangeListener {

src/com/android/settings/widget/SwitchBarController.java

@@ -17,6 +17,7 @@
 package com.android.settings.widget;
 
 import android.widget.Switch;
+
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 /*

src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java

@@ -19,13 +19,15 @@ import android.app.AlertDialog;
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.widget.ArrayAdapter;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceDialogFragment;
+
 import com.android.settingslib.core.instrumentation.Instrumentable;
 
 import java.util.ArrayList;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceDialogFragment;
+
 /**
  * {@link PreferenceDialogFragment} that updates the available options
  * when {@code onListPreferenceUpdated} is called."

src/com/android/settings/widget/UsageGraph.java

@@ -30,7 +30,6 @@ import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.Shader.TileMode;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.VisibleForTesting;
 import android.util.AttributeSet;
 import android.util.SparseIntArray;
 import android.util.TypedValue;
@@ -39,6 +38,8 @@ import android.view.View;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settingslib.R;
 
+import androidx.annotation.VisibleForTesting;
+
 public class UsageGraph extends View {
 
     private static final int PATH_DELIM = -1;

src/com/android/settings/widget/ValidatedEditTextPreference.java

@@ -18,20 +18,20 @@ package com.android.settings.widget;
 
 import android.app.AlertDialog;
 import android.content.Context;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceViewHolder;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import com.android.settingslib.CustomEditTextPreference;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * {@code EditTextPreference} that supports input validation.
  */

src/com/android/settings/widget/VideoPreference.java

@@ -22,9 +22,6 @@ import android.content.res.TypedArray;
 import android.graphics.SurfaceTexture;
 import android.media.MediaPlayer;
 import android.net.Uri;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.Surface;
@@ -34,6 +31,10 @@ import android.widget.ImageView;
 
 import com.android.settings.R;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * A full width preference that hosts a MP4 video.
  */

src/com/android/settings/widget/WorkOnlyCategory.java

@@ -16,12 +16,13 @@ package com.android.settings.widget;
 
 import android.content.Context;
 import android.os.UserManager;
-import androidx.preference.PreferenceCategory;
 import android.util.AttributeSet;
 
 import com.android.settings.SelfAvailablePreference;
 import com.android.settings.Utils;
 
+import androidx.preference.PreferenceCategory;
+
 /**
  * A PreferenceCategory that is only visible when the device has a work profile.
  */