Sort imports

Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b

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

@@ -20,14 +20,14 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.view.View;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.settingslib.core.lifecycle.Lifecycle;
 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

@@ -22,12 +22,12 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
 
-import com.android.settings.R;
-
 import androidx.annotation.StringRes;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settings.R;
+
 public class ActionButtonPreference extends Preference {
 
     private final ButtonInfo mButton1Info = new ButtonInfo();

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

@@ -23,11 +23,11 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.settings.R;
-
 import androidx.preference.CheckBoxPreference;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settings.R;
+
 /**
  * {@link CheckBoxPreference} that used only to display app
  */

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

@@ -21,11 +21,11 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ProgressBar;
 
-import com.android.settings.R;
-
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settings.R;
+
 public class AppPreference extends Preference {
 
     private int mProgress;

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

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

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

@@ -19,10 +19,10 @@ import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
-import com.android.settings.R;
-
 import androidx.annotation.VisibleForTesting;
 
+import com.android.settings.R;
+
 /**
  * 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

@@ -23,10 +23,10 @@ import android.view.Gravity;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.android.settingslib.R;
-
 import androidx.annotation.VisibleForTesting;
 
+import com.android.settingslib.R;
+
 /**
  * An extension of LinearLayout that automatically switches to vertical
  * orientation when it can't fit its child views horizontally.

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 androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 
 import java.util.Locale;
 
-import androidx.annotation.ColorRes;
-import androidx.annotation.VisibleForTesting;
-
 /**
  * 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

@@ -34,12 +34,12 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.Interpolator;
 
+import androidx.viewpager.widget.ViewPager;
+
 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

@@ -39,6 +39,11 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
@@ -51,11 +56,6 @@ 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.fragment.app.Fragment;
-import androidx.recyclerview.widget.RecyclerView;
-
 public class EntityHeaderController {
 
     @IntDef({ActionType.ACTION_NONE,

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

@@ -20,11 +20,11 @@ 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;
 
+import com.android.settings.R;
+
 /**
  * A preference whose summary text will only span one single line.
  */

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

@@ -20,11 +20,11 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.preference.PreferenceViewHolder;
+
 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

@@ -30,9 +30,6 @@ import android.util.Log;
 import android.util.TypedValue;
 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;
@@ -40,6 +37,9 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
 public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter {
 
     private static final String TAG = "HighlightableAdapter";

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

@@ -27,12 +27,12 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.SeekBar;
 
-import java.util.List;
-
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
 import androidx.customview.widget.ExploreByTouchHelper;
 
+import java.util.List;
+
 /**
  * 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

@@ -22,11 +22,11 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.CheckBox;
 
+import androidx.preference.PreferenceViewHolder;
+
 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 com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 import androidx.preference.Preference;
 
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
 /*
  * The switch controller that is used to update the switch widget in the MasterSwitchPreference
  * layout.

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

@@ -22,12 +22,12 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Switch;
 
+import androidx.preference.PreferenceViewHolder;
+
 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

@@ -26,6 +26,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.LayoutRes;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -34,11 +39,6 @@ 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

@@ -22,12 +22,12 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.settings.R;
-
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.preference.CheckBoxPreference;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settings.R;
+
 /**
  * Check box preference with check box replaced by radio button.
  *

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

@@ -22,13 +22,13 @@ import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceViewHolder;
+
 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

@@ -23,10 +23,10 @@ import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 
-import java.util.Locale;
-
 import androidx.viewpager.widget.ViewPager;
 
+import java.util.Locale;
+
 /**
  * A {@link ViewPager} that's aware of RTL changes when used with FragmentPagerAdapter.
  */

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

@@ -28,11 +28,11 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 
-import com.android.settingslib.RestrictedPreference;
-
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settingslib.RestrictedPreference;
+
 /**
  * Based on android.preference.SeekBarPreference, but uses support preference as base.
  */

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

@@ -19,11 +19,11 @@ package com.android.settings.widget;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.android.settings.R;
-
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.preference.Preference;
 
+import com.android.settings.R;
+
 /**
  * A preference with single target and a gear icon on the side.
  */

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

@@ -25,10 +25,10 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.settings.R;
-
 import androidx.viewpager.widget.PagerAdapter;
 
+import com.android.settings.R;
+
 /**
  * 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

@@ -36,6 +36,10 @@ import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.RestrictedLockUtils;
@@ -44,10 +48,6 @@ 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/TwoStateButtonPreference.java

@@ -22,12 +22,12 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
 
-import com.android.settings.R;
-import com.android.settings.applications.LayoutPreference;
-
 import androidx.annotation.VisibleForTesting;
 import androidx.core.content.res.TypedArrayUtils;
 
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+
 /**
  * Preference that presents a button with two states(On vs Off)
  */

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

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

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

@@ -35,11 +35,11 @@ import android.util.SparseIntArray;
 import android.util.TypedValue;
 import android.view.View;
 
+import androidx.annotation.VisibleForTesting;
+
 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

@@ -26,12 +26,12 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.android.settingslib.CustomEditTextPreferenceCompat;
-
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settingslib.CustomEditTextPreferenceCompat;
+
 /**
  * {@code EditTextPreference} that supports input validation.
  */

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

@@ -29,12 +29,12 @@ import android.view.TextureView;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.android.settings.R;
-
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settings.R;
+
 /**
  * A full width preference that hosts a MP4 video.
  */

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

@@ -18,13 +18,13 @@ package com.android.settings.widget;
 
 import android.content.Context;
 
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-import androidx.preference.PreferenceScreen;
-
 public class VideoPreferenceController extends BasePreferenceController implements
         LifecycleObserver, OnResume, OnPause {
 

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

@@ -18,11 +18,11 @@ import android.content.Context;
 import android.os.UserManager;
 import android.util.AttributeSet;
 
+import androidx.preference.PreferenceCategory;
+
 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.
  */