Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

src/com/android/settings/applications/manageapplications/AppFilterItem.java

@@ -16,12 +16,12 @@
 
 package com.android.settings.applications.manageapplications;
 
-import androidx.annotation.StringRes;
-
 import com.android.settingslib.applications.ApplicationsState;
 
 import java.util.Objects;
 
+import androidx.annotation.StringRes;
+
 /**
  * Data model for a displayable app filter.
  */

src/com/android/settings/applications/manageapplications/AppFilterRegistry.java

@@ -16,19 +16,19 @@
 
 package com.android.settings.applications.manageapplications;
 
-import androidx.annotation.IntDef;
-
 import com.android.settings.R;
+import com.android.settings.applications.AppStateDirectoryAccessBridge;
 import com.android.settings.applications.AppStateInstallAppsBridge;
 import com.android.settings.applications.AppStateNotificationBridge;
 import com.android.settings.applications.AppStateOverlayBridge;
 import com.android.settings.applications.AppStatePowerBridge;
-import com.android.settings.applications.AppStateDirectoryAccessBridge;
 import com.android.settings.applications.AppStateUsageBridge;
 import com.android.settings.applications.AppStateWriteSettingsBridge;
 import com.android.settings.wifi.AppStateChangeWifiStateBridge;
 import com.android.settingslib.applications.ApplicationsState;
 
+import androidx.annotation.IntDef;
+
 /**
  * A registry and helper class that manages all {@link AppFilterItem}s for ManageApplications UI.
  */

src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java

@@ -19,9 +19,6 @@ package com.android.settings.applications.manageapplications;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.StringRes;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -35,6 +32,10 @@ import com.android.settings.R;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class ApplicationViewHolder extends RecyclerView.ViewHolder {
 
     private final TextView mAppName;

src/com/android/settings/applications/manageapplications/ManageApplications.java

@@ -42,7 +42,6 @@ import android.annotation.Nullable;
 import android.annotation.StringRes;
 import android.app.Activity;
 import android.app.usage.IUsageStatsManager;
-import android.app.usage.UsageStatsManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -53,10 +52,6 @@ import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.PreferenceFrameLayout;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
@@ -131,6 +126,11 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Activity to pick an application that will be used to display installation information and
  * options to uninstall/delete user data for system applications. This activity

src/com/android/settings/applications/manageapplications/MusicViewHolderController.java

@@ -21,7 +21,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.UserHandle;
 import android.provider.DocumentsContract;
-import androidx.annotation.WorkerThread;
 import android.text.format.Formatter;
 import android.util.Log;
 
@@ -31,6 +30,8 @@ import com.android.settingslib.applications.StorageStatsSource;
 
 import java.io.IOException;
 
+import androidx.annotation.WorkerThread;
+
 /**
  * MusicViewHolderController controls an Audio/Music file view in the ManageApplications view.
  */

src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java

@@ -20,7 +20,6 @@ import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.UserHandle;
-import androidx.annotation.WorkerThread;
 import android.text.format.Formatter;
 import android.util.Log;
 
@@ -30,6 +29,8 @@ import com.android.settingslib.applications.StorageStatsSource;
 
 import java.io.IOException;
 
+import androidx.annotation.WorkerThread;
+
 /** PhotosViewHolderController controls an Audio/Music file view in the ManageApplications view. */
 public class PhotosViewHolderController implements FileViewHolderController {
     private static final String TAG = "PhotosViewHolderCtrl";

src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java

@@ -18,7 +18,6 @@ package com.android.settings.applications.manageapplications;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.preference.Preference;
 import android.text.TextUtils;
 
 import com.android.settings.core.PreferenceControllerMixin;
@@ -28,6 +27,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnCreate;
 import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
 
+import androidx.preference.Preference;
+
 public class ResetAppPrefPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {