Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

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

@@ -32,9 +32,6 @@ import android.net.TrafficStats;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.UserHandle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
 import android.util.ArraySet;
 import android.util.IconDrawableFactory;
 import android.util.Log;
@@ -54,6 +51,10 @@ import com.android.settingslib.net.ChartDataLoader;
 import com.android.settingslib.net.UidDetail;
 import com.android.settingslib.net.UidDetailProvider;
 
+import androidx.annotation.VisibleForTesting;
+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

@@ -15,7 +15,6 @@
 package com.android.settings.datausage;
 
 import android.content.Context;
-import androidx.preference.PreferenceViewHolder;
 import android.view.View;
 import android.widget.ProgressBar;
 
@@ -25,6 +24,8 @@ 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

@@ -19,10 +19,12 @@ package com.android.settings.datausage;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import androidx.preference.Preference;
 import android.util.ArraySet;
+
 import com.android.settingslib.utils.AsyncLoader;
 
+import androidx.preference.Preference;
+
 public class AppPrefLoader extends AsyncLoader<ArraySet<Preference>> {
     private ArraySet<String> mPackages;
     private PackageManager mPackageManager;

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

@@ -25,9 +25,6 @@ import android.os.Looper;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.Settings.Global;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.PreferenceViewHolder;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -44,6 +41,10 @@ import com.android.settingslib.CustomDialogPreference;
 
 import java.util.List;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.PreferenceViewHolder;
+
 public class CellDataPreference extends CustomDialogPreference implements TemplatePreference {
 
     private static final String TAG = "CellDataPreference";

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

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

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

@@ -16,7 +16,6 @@ package com.android.settings.datausage;
 
 import android.app.Application;
 import android.os.Bundle;
-import androidx.preference.Preference;
 import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -34,6 +33,8 @@ import com.android.settingslib.applications.ApplicationsState.Session;
 
 import java.util.ArrayList;
 
+import androidx.preference.Preference;
+
 public class DataSaverSummary extends SettingsPreferenceFragment
         implements OnSwitchChangeListener, Listener, Callback, Callbacks {
 

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

@@ -15,6 +15,7 @@
 package com.android.settings.datausage;
 
 import android.net.NetworkTemplate;
+
 import com.android.settingslib.NetworkPolicyEditor;
 
 /**

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

@@ -15,6 +15,7 @@
 package com.android.settings.datausage;
 
 import android.net.NetworkPolicy;
+
 import com.android.settingslib.net.DataUsageController.DataUsageInfo;
 
 /**

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

@@ -41,9 +41,6 @@ import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -70,6 +67,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import androidx.annotation.VisibleForTesting;
+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/DataUsageSummaryPreference.java

@@ -22,8 +22,6 @@ import android.content.Intent;
 import android.graphics.Typeface;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
@@ -45,6 +43,9 @@ import com.android.settingslib.utils.StringUtil;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 /**
  * Provides a summary of data usage.
  */

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

@@ -21,9 +21,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.recyclerview.widget.RecyclerView;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.SubscriptionPlan;
@@ -45,6 +42,10 @@ 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/NetworkRestrictionsPreference.java

@@ -16,9 +16,10 @@ package com.android.settings.datausage;
 
 import android.content.Context;
 import android.net.NetworkTemplate;
-import androidx.preference.Preference;
 import android.util.AttributeSet;
 
+import androidx.preference.Preference;
+
 public class NetworkRestrictionsPreference extends Preference implements TemplatePreference {
 
     public NetworkRestrictionsPreference(Context context, AttributeSet attrs) {

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

@@ -15,14 +15,16 @@
 package com.android.settings.datausage;
 
 import android.content.Context;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 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;
+
 public class SpinnerPreference extends Preference implements CycleAdapter.SpinnerInterface {
 
     private CycleAdapter mAdapter;

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

@@ -19,9 +19,9 @@ import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
 import android.os.INetworkManagementService;
 import android.os.UserManager;
-import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+
 import com.android.settingslib.NetworkPolicyEditor;
 
 public interface TemplatePreference {

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

@@ -16,9 +16,10 @@ package com.android.settings.datausage;
 
 import android.content.Context;
 import android.net.NetworkTemplate;
+import android.util.AttributeSet;
+
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
-import android.util.AttributeSet;
 
 public class TemplatePreferenceCategory extends PreferenceCategory implements TemplatePreference {