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/connecteddevice/AddDevicePreferenceController.java

@@ -22,15 +22,15 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 /**
  * Controller to maintain the {@link androidx.preference.Preference} for add
  * device. It monitor Bluetooth's status(on/off) and decide if need to show summary or not.

src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java

@@ -18,12 +18,12 @@ package com.android.settings.connecteddevice;
 import android.content.Context;
 import android.provider.Settings;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.nfc.NfcPreferenceController;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Controller that used to show which component is available
  */

src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java

@@ -21,6 +21,11 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
@@ -33,11 +38,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
 /**
  * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all
  * available media devices. It uses {@link DevicePreferenceCallback}

src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java

@@ -18,6 +18,11 @@ package com.android.settings.connecteddevice;
 import android.content.Context;
 import android.content.pm.PackageManager;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
 import com.android.settings.connecteddevice.dock.DockUpdater;
@@ -31,11 +36,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
 /**
  * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all
  * connected devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference}

src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java

@@ -25,6 +25,9 @@ import android.content.pm.PackageManager;
 import android.text.BidiFormatter;
 import android.text.TextUtils;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.bluetooth.AlwaysDiscoverable;
 import com.android.settings.bluetooth.Utils;
@@ -37,9 +40,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.widget.FooterPreference;
 import com.android.settingslib.widget.FooterPreferenceMixinCompat;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
-
 /**
  * Controller that shows and updates the bluetooth device name
  */

src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java

@@ -18,6 +18,10 @@ package com.android.settings.connecteddevice;
 import android.content.Context;
 import android.content.pm.PackageManager;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
 import com.android.settings.connecteddevice.dock.DockUpdater;
@@ -28,10 +32,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController
         implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback {
 

src/com/android/settings/connecteddevice/SavedDeviceGroupController.java

@@ -18,6 +18,11 @@ package com.android.settings.connecteddevice;
 import android.content.Context;
 import android.content.pm.PackageManager;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
 import com.android.settings.connecteddevice.dock.DockUpdater;
@@ -30,11 +35,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
 /**
  * Controller to maintain the {@link PreferenceGroup} for all
  * saved devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference}

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

@@ -19,14 +19,14 @@ 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/UsbDefaultFragment.java

@@ -20,6 +20,8 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -32,8 +34,6 @@ import com.google.android.collect.Lists;
 
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Provides options for selecting the default USB mode.
  */

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

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

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

@@ -19,13 +19,13 @@ 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

@@ -20,6 +20,8 @@ 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;
 import com.android.settings.dashboard.DashboardFragment;
@@ -33,8 +35,6 @@ 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

@@ -20,6 +20,9 @@ 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;
 import com.android.settings.widget.RadioButtonPreference;
@@ -27,9 +30,6 @@ 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

@@ -18,12 +18,12 @@ 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

@@ -19,15 +19,15 @@ package com.android.settings.connecteddevice.usb;
 import android.content.Context;
 import android.hardware.usb.UsbPort;
 
-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 androidx.preference.SwitchPreference;
 
+import com.android.settings.R;
+import com.android.settings.Utils;
+
 /**
  * This class controls the switch for changing USB power direction.
  */