Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java

@@ -18,14 +18,15 @@ package com.android.settings.connecteddevice.usb;
 import android.content.Context;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbPort;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
 /**
  * Controller to maintain connected usb device
  */

src/com/android/settings/connecteddevice/usb/UsbBackend.java

@@ -24,6 +24,7 @@ import android.hardware.usb.UsbPortStatus;
 import android.net.ConnectivityManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+
 import androidx.annotation.VisibleForTesting;
 
 /**

src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java

@@ -24,8 +24,8 @@ import android.hardware.usb.UsbPort;
 import android.hardware.usb.UsbPortStatus;
 
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
 /**
  * Receiver to receive usb update and use {@link UsbConnectionListener} to invoke callback

src/com/android/settings/connecteddevice/usb/UsbDetailsController.java

@@ -18,12 +18,13 @@ package com.android.settings.connecteddevice.usb;
 
 import android.content.Context;
 import android.os.Handler;
-import androidx.annotation.UiThread;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
+import androidx.annotation.UiThread;
+
 /**
  * This class provides common members and refresh functionality for usb controllers.
  */

src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java

@@ -18,13 +18,14 @@ package com.android.settings.connecteddevice.usb;
 
 import android.content.Context;
 import android.hardware.usb.UsbPort;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.widget.RadioButtonPreference;
 
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
 /**
  * This class controls the radio buttons for switching between
  * USB device and host mode.

src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java

@@ -19,7 +19,6 @@ package com.android.settings.connecteddevice.usb;
 import android.content.Context;
 import android.os.Bundle;
 import android.provider.SearchIndexableResource;
-import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
@@ -34,6 +33,8 @@ import com.google.android.collect.Lists;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.VisibleForTesting;
+
 /**
  * Controls the USB device details and provides updates to individual controllers.
  */

src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java

@@ -19,8 +19,6 @@ package com.android.settings.connecteddevice.usb;
 import android.content.Context;
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbPort;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -29,6 +27,9 @@ import com.android.settings.widget.RadioButtonPreference;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
 /**
  * This class controls the radio buttons for choosing between different USB functions.
  */

src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java

@@ -17,12 +17,13 @@
 package com.android.settings.connecteddevice.usb;
 
 import android.content.Context;
-import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.widget.EntityHeaderController;
 
+import androidx.preference.PreferenceScreen;
+
 /**
  * This class adds a header with device name.
  */

src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java

@@ -18,14 +18,15 @@ package com.android.settings.connecteddevice.usb;
 
 import android.content.Context;
 import android.hardware.usb.UsbPort;
-import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceClickListener;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
+import androidx.preference.SwitchPreference;
 
 /**
  * This class controls the switch for changing USB power direction.