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/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java

@@ -21,6 +21,10 @@ import android.content.Context;
 import android.os.SystemProperties;
 import android.provider.Settings;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
@@ -33,10 +37,6 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.PreferenceScreen;
-
 public class AutomaticStorageManagementSwitchPreferenceController extends
         BasePreferenceController implements LifecycleObserver, OnResume,
         SwitchWidgetController.OnSwitchChangeListener {

src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java

@@ -21,13 +21,13 @@ import android.content.SharedPreferences;
 import android.provider.Settings;
 import android.util.SparseArray;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 
 import java.util.concurrent.TimeUnit;
 
-import androidx.annotation.VisibleForTesting;
-
 public class CachedStorageValuesHelper {
 
     @VisibleForTesting public static final String SHARED_PREFERENCES_NAME = "CachedStorageValues";

src/com/android/settings/deviceinfo/storage/SecondaryUserController.java

@@ -22,6 +22,12 @@ import android.graphics.drawable.Drawable;
 import android.os.UserManager;
 import android.util.SparseArray;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.deviceinfo.StorageItemPreference;
@@ -30,12 +36,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
 /**
  * SecondaryUserController controls the preferences on the Storage screen which had to do with
  * secondary users.

src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java

@@ -28,6 +28,11 @@ import android.os.storage.VolumeInfo;
 import android.util.Log;
 import android.util.SparseArray;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+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.Settings;
@@ -46,11 +51,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 /**
  * StorageItemPreferenceController handles the storage line items which summarize the storage
  * categorization breakdown.

src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java

@@ -26,14 +26,14 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.DonutView;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
 /**
  * StorageSummaryDonutPreference is a preference which summarizes the used and remaining storage left
  * on a given storage volume. It is visualized with a donut graphing the % used.

src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java

@@ -21,14 +21,14 @@ import android.os.storage.VolumeInfo;
 import android.text.TextUtils;
 import android.text.format.Formatter;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 /**
  * StorgaeSummaryPreferenceController updates the donut storage summary preference to have the
  * correct sizes showing.

src/com/android/settings/deviceinfo/storage/UserProfileController.java

@@ -23,6 +23,9 @@ import android.os.Bundle;
 import android.os.storage.VolumeInfo;
 import android.util.SparseArray;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.util.Preconditions;
 import com.android.settings.Utils;
@@ -32,9 +35,6 @@ import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settings.deviceinfo.StorageProfileFragment;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 /**
  * Defines a {@link AbstractPreferenceController} which handles a single profile of the primary
  * user.

src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java

@@ -20,14 +20,14 @@ import android.app.usage.StorageStatsManager;
 import android.content.Context;
 import android.os.storage.VolumeInfo;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 import com.android.settingslib.utils.AsyncLoaderCompat;
 
 import java.io.IOException;
 
-import androidx.annotation.VisibleForTesting;
-
 public class VolumeSizesLoader extends AsyncLoaderCompat<PrivateStorageInfo> {
     private StorageVolumeProvider mVolumeProvider;
     private StorageStatsManager mStats;