DO NOT MERGE Import clean up.

Reordered all imports according to Android codestyle.

Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98

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

@@ -21,11 +21,12 @@ import android.content.Context;
 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.core.BasePreferenceController;
 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;

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

@@ -17,7 +17,9 @@ 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;

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

@@ -19,16 +19,18 @@ import static com.android.settingslib.Utils.isAudioModeOngoingCall;
 
 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.R;
 import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.R;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;

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

@@ -19,17 +19,14 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController;
 import com.android.settings.bluetooth.BluetoothSwitchPreferenceController;
-import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.location.ScanningSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.widget.SwitchBar;

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

@@ -18,13 +18,13 @@ package com.android.settings.connecteddevice;
 import android.app.Activity;
 import android.content.Context;
 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;
 import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;

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

@@ -15,8 +15,9 @@
  */
 package com.android.settings.connecteddevice;
 
-import android.content.pm.PackageManager;
 import android.content.Context;
+import android.content.pm.PackageManager;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
@@ -31,9 +32,9 @@ import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.DockUpdaterFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
 
 /**
  * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all

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

@@ -22,21 +22,22 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import androidx.preference.PreferenceScreen;
 import android.text.BidiFormatter;
 import android.text.TextUtils;
 
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
 import com.android.settings.bluetooth.AlwaysDiscoverable;
 import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.R;
 import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.widget.FooterPreference;
 import com.android.settingslib.widget.FooterPreferenceMixin;
 

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

@@ -17,6 +17,7 @@ package com.android.settings.connecteddevice;
 
 import android.content.Context;
 import android.content.res.Resources;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;

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

@@ -17,20 +17,18 @@ 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 android.util.Log;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
-
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
-import com.android.settingslib.utils.ThreadUtils;
 
 public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController
         implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback {

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

@@ -15,8 +15,9 @@
  */
 package com.android.settings.connecteddevice;
 
-import android.content.pm.PackageManager;
 import android.content.Context;
+import android.content.pm.PackageManager;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;

src/com/android/settings/connecteddevice/dock/DockUpdater.java

@@ -15,8 +15,6 @@
  */
 package com.android.settings.connecteddevice.dock;
 
-import android.content.Context;
-
 /**
  * Update the dock devices. It notifies the upper level whether to add/remove the preference
  * through {@link DevicePreferenceCallback}

src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java

@@ -3,7 +3,6 @@ package com.android.settings.connecteddevice.dock;
 import android.content.Context;
 
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
-import com.android.settings.connecteddevice.dock.DockUpdater;
 import com.android.settings.overlay.DockUpdaterFeatureProvider;
 
 /**

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

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

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,6 +18,7 @@ package com.android.settings.connecteddevice.usb;
 
 import android.content.Context;
 import android.os.Handler;
+
 import androidx.annotation.UiThread;
 
 import com.android.internal.annotations.VisibleForTesting;

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

@@ -18,6 +18,7 @@ package com.android.settings.connecteddevice.usb;
 
 import android.content.Context;
 import android.hardware.usb.UsbPort;
+
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 

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

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

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

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

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

@@ -17,6 +17,7 @@
 package com.android.settings.connecteddevice.usb;
 
 import android.content.Context;
+
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;

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

@@ -18,11 +18,12 @@ package com.android.settings.connecteddevice.usb;
 
 import android.content.Context;
 import android.hardware.usb.UsbPort;
-import androidx.preference.SwitchPreference;
+
 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;