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/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,6 +16,8 @@
 
 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;
@@ -27,8 +29,6 @@ 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

@@ -28,14 +28,14 @@ import android.widget.ImageView;
 import android.widget.Switch;
 import android.widget.TextView;
 
-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;
 
+import com.android.settings.R;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
 public class ApplicationViewHolder extends RecyclerView.ViewHolder {
 
     private final TextView mAppName;

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

@@ -17,6 +17,7 @@
 package com.android.settings.applications.manageapplications;
 
 import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+
 import static com.android.settings.applications.manageapplications.AppFilterRegistry
         .FILTER_APPS_ALL;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry
@@ -68,6 +69,11 @@ import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
 import android.widget.Spinner;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.Settings;
@@ -127,11 +133,6 @@ 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

@@ -23,15 +23,15 @@ import android.provider.DocumentsContract;
 import android.text.format.Formatter;
 import android.util.Log;
 
+import androidx.annotation.WorkerThread;
+import androidx.fragment.app.Fragment;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settingslib.applications.StorageStatsSource;
 
 import java.io.IOException;
 
-import androidx.annotation.WorkerThread;
-import androidx.fragment.app.Fragment;
-
 /**
  * MusicViewHolderController controls an Audio/Music file view in the ManageApplications view.
  */

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

@@ -22,15 +22,15 @@ import android.os.UserHandle;
 import android.text.format.Formatter;
 import android.util.Log;
 
+import androidx.annotation.WorkerThread;
+import androidx.fragment.app.Fragment;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settingslib.applications.StorageStatsSource;
 
 import java.io.IOException;
 
-import androidx.annotation.WorkerThread;
-import androidx.fragment.app.Fragment;
-
 /** 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

@@ -20,6 +20,8 @@ import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
 
+import androidx.preference.Preference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -27,8 +29,6 @@ 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 {
 

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

@@ -34,12 +34,12 @@ import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.webkit.IWebViewUpdateService;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.android.settings.R;
 
 import java.util.List;
 
-import androidx.appcompat.app.AlertDialog;
-
 public class ResetAppsHelper implements DialogInterface.OnClickListener,
         DialogInterface.OnDismissListener {