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/location/AppSettingsInjector.java

@@ -26,8 +26,6 @@ import com.android.settings.widget.RestrictedAppPreference;
 import com.android.settingslib.location.InjectedSetting;
 import com.android.settingslib.location.SettingsInjector;
 
-import java.util.List;
-
 /**
  * Adds the preferences specified by the {@link InjectedSetting} objects to a preference group.
  */

src/com/android/settings/location/BluetoothScanningPreferenceController.java

@@ -16,12 +16,12 @@ package com.android.settings.location;
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
 public class BluetoothScanningPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {
 

src/com/android/settings/location/LocationEnabler.java

@@ -28,6 +28,8 @@ import android.os.UserManager;
 import android.provider.Settings;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -35,8 +37,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-import androidx.annotation.VisibleForTesting;
-
 
 /**
  * A class that listens to location settings change and modifies location settings

src/com/android/settings/location/LocationFooterPreferenceController.java

@@ -24,6 +24,10 @@ import android.content.pm.ResolveInfo;
 import android.location.LocationManager;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -34,10 +38,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-
 /**
  * Preference controller for location footer preference category
  */

src/com/android/settings/location/LocationForWorkPreferenceController.java

@@ -18,15 +18,15 @@ package com.android.settings.location;
 import android.content.Context;
 import android.os.UserManager;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 public class LocationForWorkPreferenceController extends LocationBasePreferenceController {
 
     /**

src/com/android/settings/location/LocationPreferenceController.java

@@ -22,6 +22,10 @@ import android.content.IntentFilter;
 import android.location.LocationManager;
 import android.provider.Settings.Secure;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -30,10 +34,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 public class LocationPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 

src/com/android/settings/location/LocationScanningPreferenceController.java

@@ -18,11 +18,11 @@ package com.android.settings.location;
 
 import android.content.Context;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
-import androidx.annotation.VisibleForTesting;
-
 
 public class LocationScanningPreferenceController extends BasePreferenceController {
 

src/com/android/settings/location/LocationServicePreferenceController.java

@@ -21,6 +21,11 @@ import android.location.SettingInjectorService;
 import android.os.UserHandle;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.Utils;
 import com.android.settings.widget.RestrictedAppPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -30,11 +35,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
 public class LocationServicePreferenceController extends LocationBasePreferenceController
         implements LifecycleObserver, OnResume, OnPause {
 

src/com/android/settings/location/LocationSliceBuilder.java

@@ -18,6 +18,7 @@
 package com.android.settings.location;
 
 import static android.provider.SettingsSlicesContract.KEY_LOCATION;
+
 import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
 
 import android.annotation.ColorInt;
@@ -28,18 +29,18 @@ import android.content.Intent;
 import android.net.Uri;
 import android.provider.SettingsSlicesContract;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SubSettings;
-import com.android.settings.Utils;
-import com.android.settings.slices.SliceBuilderUtils;
-
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
 import androidx.slice.builders.ListBuilder;
 import androidx.slice.builders.ListBuilder.RowBuilder;
 import androidx.slice.builders.SliceAction;
 
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.Utils;
+import com.android.settings.slices.SliceBuilderUtils;
+
 /**
  * Utility class to build an intent-based Location Slice.
  */

src/com/android/settings/location/RecentLocationRequestPreferenceController.java

@@ -17,6 +17,11 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.UserHandle;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.core.SubSettingLauncher;
@@ -27,11 +32,6 @@ import com.android.settingslib.location.RecentLocationApps;
 
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
 public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController {
 
     /** Key for preference category "Recent location requests" */

src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java

@@ -18,17 +18,17 @@ package com.android.settings.location;
 
 import android.content.Context;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.widget.AppPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.location.RecentLocationApps;
 
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
 /** Preference controller for preference category displaying all recent location requests. */
 public class RecentLocationRequestSeeAllPreferenceController
         extends LocationBasePreferenceController {

src/com/android/settings/location/WifiScanningPreferenceController.java

@@ -16,12 +16,12 @@ package com.android.settings.location;
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
 public class WifiScanningPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {