Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

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

@@ -19,7 +19,6 @@ package com.android.settings.deviceinfo.storage;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.provider.Settings;
-import androidx.annotation.VisibleForTesting;
 import android.util.SparseArray;
 
 import com.android.settingslib.applications.StorageStatsSource;
@@ -27,6 +26,8 @@ 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

@@ -20,11 +20,6 @@ import android.content.Context;
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.os.UserManager;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
 import android.util.SparseArray;
 
 import com.android.settings.Utils;
@@ -35,6 +30,12 @@ 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

@@ -26,9 +26,6 @@ import android.net.TrafficStats;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.storage.VolumeInfo;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
 import android.util.Log;
 import android.util.SparseArray;
 
@@ -50,6 +47,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.VisibleForTesting;
+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

@@ -20,27 +20,19 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.storage.StorageManager;
-import android.provider.Settings;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-import android.text.SpannableString;
-import android.text.Spanned;
 import android.text.TextPaint;
-import android.text.TextUtils;
 import android.text.style.StyleSpan;
 import android.util.AttributeSet;
-import android.util.MathUtils;
 import android.view.View;
 import android.widget.Button;
-import android.widget.TextView;
 
 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 java.text.NumberFormat;
-import java.util.Locale;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 
 /**
  * StorageSummaryDonutPreference is a preference which summarizes the used and remaining storage left

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

@@ -18,8 +18,6 @@ package com.android.settings.deviceinfo.storage;
 
 import android.content.Context;
 import android.os.storage.VolumeInfo;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.text.format.Formatter;
 
@@ -28,6 +26,9 @@ 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/UserIconLoader.java

@@ -20,7 +20,6 @@ import android.content.Context;
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.os.UserManager;
-import android.util.Log;
 import android.util.SparseArray;
 
 import com.android.internal.util.Preconditions;

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

@@ -21,8 +21,6 @@ import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.storage.VolumeInfo;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
 import android.util.SparseArray;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -34,6 +32,9 @@ 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

@@ -19,7 +19,6 @@ package com.android.settings.deviceinfo.storage;
 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;
@@ -27,6 +26,8 @@ import com.android.settingslib.utils.AsyncLoader;
 
 import java.io.IOException;
 
+import androidx.annotation.VisibleForTesting;
+
 public class VolumeSizesLoader extends AsyncLoader<PrivateStorageInfo> {
     private StorageVolumeProvider mVolumeProvider;
     private StorageStatsManager mStats;