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/datausage/AppDataUsage.java

@@ -36,6 +36,12 @@ import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.AppInfoBase;
@@ -49,12 +55,6 @@ import com.android.settingslib.net.ChartDataLoaderCompat;
 import com.android.settingslib.net.UidDetail;
 import com.android.settingslib.net.UidDetailProvider;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-
 public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
         DataSaverBackend.Listener {
 

src/com/android/settings/datausage/AppDataUsagePreference.java

@@ -18,14 +18,14 @@ import android.content.Context;
 import android.view.View;
 import android.widget.ProgressBar;
 
+import androidx.preference.PreferenceViewHolder;
+
 import com.android.settings.widget.AppPreference;
 import com.android.settingslib.AppItem;
 import com.android.settingslib.net.UidDetail;
 import com.android.settingslib.net.UidDetailProvider;
 import com.android.settingslib.utils.ThreadUtils;
 
-import androidx.preference.PreferenceViewHolder;
-
 public class AppDataUsagePreference extends AppPreference {
 
     private final AppItem mItem;

src/com/android/settings/datausage/AppPrefLoader.java

@@ -21,10 +21,10 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.util.ArraySet;
 
-import com.android.settingslib.utils.AsyncLoaderCompat;
-
 import androidx.preference.Preference;
 
+import com.android.settingslib.utils.AsyncLoaderCompat;
+
 public class AppPrefLoader extends AsyncLoaderCompat<ArraySet<Preference>> {
     private ArraySet<String> mPackages;
     private PackageManager mPackageManager;

src/com/android/settings/datausage/BillingCyclePreference.java

@@ -21,13 +21,13 @@ import android.os.Bundle;
 import android.os.RemoteException;
 import android.util.AttributeSet;
 
+import androidx.preference.Preference;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.datausage.CellDataPreference.DataStateListener;
 
-import androidx.preference.Preference;
-
 public class BillingCyclePreference extends Preference implements TemplatePreference {
 
     private NetworkTemplate mTemplate;

src/com/android/settings/datausage/BillingCycleSettings.java

@@ -33,6 +33,12 @@ import android.widget.EditText;
 import android.widget.NumberPicker;
 import android.widget.Spinner;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -45,12 +51,6 @@ import com.android.settingslib.search.SearchIndexable;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
 @SearchIndexable
 public class BillingCycleSettings extends DataUsageBase implements
         Preference.OnPreferenceChangeListener, DataUsageEditController {

src/com/android/settings/datausage/CellDataPreference.java

@@ -32,6 +32,11 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Checkable;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog.Builder;
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.PreferenceViewHolder;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -40,11 +45,6 @@ import com.android.settingslib.CustomDialogPreferenceCompat;
 
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog.Builder;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.PreferenceViewHolder;
-
 public class CellDataPreference extends CustomDialogPreferenceCompat implements TemplatePreference {
 
     private static final String TAG = "CellDataPreference";

src/com/android/settings/datausage/ChartDataUsagePreference.java

@@ -25,14 +25,14 @@ import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
 import android.util.SparseIntArray;
 
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.widget.UsageView;
-
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.widget.UsageView;
+
 public class ChartDataUsagePreference extends Preference {
 
     // The resolution we show on the graph so that we can squash things down to ints.

src/com/android/settings/datausage/DataSaverPreference.java

@@ -17,10 +17,10 @@ package com.android.settings.datausage;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.android.settings.R;
-
 import androidx.preference.Preference;
 
+import com.android.settings.R;
+
 public class DataSaverPreference extends Preference implements DataSaverBackend.Listener {
 
     private final DataSaverBackend mDataSaverBackend;

src/com/android/settings/datausage/DataSaverSummary.java

@@ -21,6 +21,8 @@ import android.provider.SearchIndexableResource;
 import android.telephony.SubscriptionManager;
 import android.widget.Switch;
 
+import androidx.preference.Preference;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -40,8 +42,6 @@ import com.android.settingslib.search.SearchIndexable;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.preference.Preference;
-
 @SearchIndexable
 public class DataSaverSummary extends SettingsPreferenceFragment
         implements OnSwitchChangeListener, Listener, Callback, Callbacks {

src/com/android/settings/datausage/DataUsageList.java

@@ -51,6 +51,12 @@ import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ImageView;
 import android.widget.Spinner;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
@@ -66,12 +72,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
-import androidx.loader.content.Loader;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
 /**
  * Panel showing data usage history across various networks, including options
  * to inspect based on usage cycle and control through {@link NetworkPolicy}.

src/com/android/settings/datausage/DataUsagePreference.java

@@ -21,15 +21,15 @@ import android.net.NetworkTemplate;
 import android.os.Bundle;
 import android.util.AttributeSet;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.Preference;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settingslib.net.DataUsageController;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.Preference;
-
 public class DataUsagePreference extends Preference implements TemplatePreference {
 
     private NetworkTemplate mTemplate;

src/com/android/settings/datausage/DataUsageSummary.java

@@ -29,6 +29,10 @@ import android.text.TextUtils;
 import android.text.format.Formatter;
 import android.text.style.RelativeSizeSpan;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -43,10 +47,6 @@ import com.android.settingslib.search.SearchIndexable;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 /**
  * Settings preference fragment that displays data usage summary.
  */

src/com/android/settings/datausage/DataUsageSummaryPreference.java

@@ -33,6 +33,10 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
@@ -43,10 +47,6 @@ import com.android.settingslib.utils.StringUtil;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
 /**
  * Provides a summary of data usage.
  */

src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java

@@ -29,6 +29,10 @@ import android.text.format.Formatter;
 import android.util.Log;
 import android.util.RecurrenceRule;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.internal.util.CollectionUtils;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
@@ -42,10 +46,6 @@ import com.android.settingslib.net.DataUsageController;
 
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.recyclerview.widget.RecyclerView;
-
 /**
  * This is the controller for the top of the data usage screen that retrieves carrier data from the
  * new subscriptions framework API if available. The controller reads subscription information from

src/com/android/settings/datausage/SpinnerPreference.java

@@ -20,11 +20,11 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Spinner;
 
-import com.android.settings.R;
-
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settings.R;
+
 public class SpinnerPreference extends Preference implements CycleAdapter.SpinnerInterface {
 
     private CycleAdapter mAdapter;

src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java

@@ -19,6 +19,8 @@ import android.content.Context;
 import android.os.UserHandle;
 import android.view.View;
 
+import androidx.preference.PreferenceViewHolder;
+
 import com.android.settings.R;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.dashboard.DashboardFragment;
@@ -28,8 +30,6 @@ import com.android.settingslib.RestrictedPreferenceHelper;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
-import androidx.preference.PreferenceViewHolder;
-
 public class UnrestrictedDataAccessPreference extends AppSwitchPreference implements
         DataSaverBackend.Listener {
 

src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java

@@ -19,6 +19,10 @@ import android.app.Application;
 import android.content.Context;
 import android.os.UserHandle;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.AppStateBaseBridge;
@@ -38,10 +42,6 @@ import java.util.ArrayList;
 import java.util.Set;
 import java.util.TreeSet;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 
 public class UnrestrictedDataAccessPreferenceController extends BasePreferenceController implements
         LifecycleObserver, OnStart, OnStop, OnDestroy, ApplicationsState.Callbacks,